fix vimshell
and nnoremap for ctrlp
Merge branch 'master' of github.com:HerringtonDarkholme/Vimfile