add ctrlp and ù shortcuts
Merge branch 'master' of github.com:mmwoodman/.vim
merge