rearrange ctrlp.vim
rearrange ctrlp.vim
Merge branch 'master' of https://github.com/robinchenyu/vimfiles

Conflicts:
	vimrc
vimrc fix