Readd ctrlp
Remove pathogen
Remove ctrlp
Add Vundle
Merge branch 'master' of http://github.com/chmouel/vim-config

Conflicts:
	.gitmodules