ctrlp_working_path_mode
NERDTree and Tagbar
Merge remote-tracking branch 'origin/master'

Conflicts:
	.vimrc