Add ctrlP to vim
Merge branch 'master' of github.com:vasilakisfil/config.rc

Conflicts:
	.vimrc