use new ctrlp.vim
merge from remote