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/vimrc b/vimrc
index 5ce3d57965845933decc73e23c4f237acb08a446..b0c9df9699e6a16b13aff39390d5ee244a57dae6 100755 (executable)
--- a/vimrc
+++ b/vimrc
@@ -161,3 +161,6 @@ set foldlevel=1
 
 " powerline stuff
 let g:Powerline_symbols = 'fancy'
+
+" node cleaning
+let g:ctrlp_custom_ignore = 'node_modules\|DS_Store\|git'

diff --git a/zshrc b/zshrc
index a18d2846b498133d44e88c327a7800b725203e4f..29ae3acfd6c3cd5b37fba9e8cda65b59984810e3 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
 
 bindkey -v
 bindkey '^R' history-incremental-pattern-search-backward