ctrlp
merge

Merge branch 'master' of github.com:kekimmo/dotvim

Conflicts:
	.gitmodules