Merge branch 'master' of https://io.monkeybox.org/git/fdamstra/MyEnvironment

.bashrc

@@ -134,7 +134,7 @@ source ~/.bash/git-completion.bash
 [ -f ~/.git_token ] && source ~/.git_token
 
 # Add autocompletion for aws
-[ -x /usr/local/bin/aws_completer ] && complete -C aws_completer aws
+[ -x /usr/local/bin/aws_completer ] && complete -C '/usr/local/bin/aws_completer' aws
 
 ## iTerm integration
 #[ -f ~/.iterm2_shell_integration.bash ] && source ~/.iterm2_shell_integration.bash
@@ -157,6 +157,12 @@ export ANSIBLE_HOST_KEY_CHECKING=False
 # tabtab source for serverless package
 # uninstall by removing these lines or running `tabtab uninstall serverless`
 [ -f /usr/local/lib/node_modules/serverless/node_modules/tabtab/.completions/serverless.bash ] && . /usr/local/lib/node_modules/serverless/node_modules/tabtab/.completions/serverless.bash
+
 # tabtab source for sls package
 # uninstall by removing these lines or running `tabtab uninstall sls`
-[ -f /usr/local/lib/node_modules/serverless/node_modules/tabtab/.completions/sls.bash ] && . /usr/local/lib/node_modules/serverless/node_modules/tabtab/.completions/sls.bash
+[ -f /usr/local/lib/node_modules/serverless/node_modules/tabtab/.completions/sls.bash ] && . /usr/local/lib/node_modules/serverless/node_modules/tabtab/.completions/sls.bash
+
+# Python venv?
+if which pyenv-virtualenv-init > /dev/null; then eval "$(pyenv virtualenv-init -)"; fi
+
+alias python='python3'

.vimrc

@@ -48,3 +48,6 @@ filetype plugin indent on    " required
 " see :h vundle for more details or wiki for FAQ
 " Put your non-Plugin stuff after this line
 
+set tabstop=2
+set shiftwidth=2
+set expandtab