some tweaks on ctrlp
Merge branch 'master' of https://github.com/lucasts/dotvim

Conflicts:
	vimrc