Merge branch 'master' into mac-config

.gitmodules

@@ -43,3 +43,6 @@
 [submodule "vim/.vim/bundle/elm-vim"]
 	path = vim/.vim/bundle/elm-vim
 	url = https://github.com/ElmCast/elm-vim
+[submodule "vim/.vim/bundle/bats"]
+	path = vim/.vim/bundle/bats
+	url = https://github.com/vim-scripts/bats.vim

bash/.profile

@@ -29,11 +29,16 @@ export TERM=xterm-256color
 # Installed with https://github.com/pyenv/pyenv-installer
 if [ -x "$(command -v pyenv)" ]
 then
+  export PATH="/home/nicholas/.pyenv/bin:$PATH"
   eval "$(pyenv init -)"
+  eval "$(pyenv virtualenv-init -)"
 fi
 
-source $HOME/.install/google-cloud-sdk/completion.bash.inc
-source $HOME/.install/google-cloud-sdk/path.bash.inc
+if [ -x "$(command -v gcloud)" ]
+then
+  source $HOME/.install/google-cloud-sdk/completion.bash.inc
+  source $HOME/.install/google-cloud-sdk/path.bash.inc
+fi
 
 alias iex="iex --erl \"-kernel shell_history enabled\""
 

tmux/.tmux.conf

@@ -24,7 +24,7 @@ set -g status-attr dim
 set -g status-left '#[fg=colour245] #(whoami)@#H > #S '
 set -g status-right '#[fg=colour233,bg=colour241,bold] %m/%d #[fg=colour233,bg=colour245,bold] %I:%M '
 set -g status-right-length 50
-set -g status-left-length 30
+set -g status-left-length 40
 set -g clock-mode-style 12
 
 # Use Alt-vim keys without prefix key to switch panes

vim/.vim/bundle/bats

@@ -0,0 +1 @@
+Subproject commit 3c283f594ff8bc7fb0c25cd07ebef0f17385f94a