Merge branch 'master' of github.com:benbeltran/dotfiles

diff --git a/vim/bundle/ctrlp.vim b/vim/bundle/ctrlp.vim
index 6ddbfe2cc00a7eeb2a4450552b78276488a2e2c9..be5842a376f16c16c5dc4cc1879d7168a074f7de 160000 (submodule)
--- a/vim/bundle/ctrlp.vim
+++ b/vim/bundle/ctrlp.vim
@@ -1 +1 @@
-Subproject commit 6ddbfe2cc00a7eeb2a4450552b78276488a2e2c9
+Subproject commit be5842a376f16c16c5dc4cc1879d7168a074f7de

diff --git a/zshrc b/zshrc
index 85e83ef2d4c40fe98ca68a6c0ca30b4d0c05f3a5..b818570d458c766901d3af070445a0013701920f 100644 (file)
--- a/zshrc
+++ b/zshrc
@@ -55,6 +55,7 @@ alias rspec="rspec --color"
 
 #Screeninator and RVM scripts
 [[ -s $HOME/.rvm/scripts/rvm ]] && source $HOME/.rvm/scripts/rvm
+[[ -s $HOME/.tmuxinator/scripts/tmuxinator ]] && source $HOME/.tmuxinator/scripts/tmuxinator
 
 #
 # End of the custom things from my bash profile.