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

Conflicts:
	vimrc

1 files changed, 4 insertions, 2 deletions

diff --git a/vimrc b/vimrc
index b0c9df9..eea2e28 100755
--- a/vimrc
+++ b/vimrc
@@ -146,6 +146,7 @@ endif
 
 " Mapping for TagBar
 nmap <F8> :TagbarToggle<CR>
+let g:tagbar_ctags_bin="/usr/local/bin/ctags"
 
 " Color Column
 set colorcolumn=81
@@ -162,5 +163,6 @@ set foldlevel=1
 " powerline stuff
 let g:Powerline_symbols = 'fancy'
 
-" node cleaning
-let g:ctrlp_custom_ignore = 'node_modules\|DS_Store\|git'
+" Fix CtrlP root folder and add some ignores
+let g:ctrlp_working_path_mode = 0
+let g:ctrlp_custom_ignore = '\v[\/](\.(git|hg|svn)|node_modules|DS_Store)$'