removing ctrlp
adding unite
forgot to remove ctrlp settings
unite ctrl+p mapping
Merge 'master' into unite
configuring shortcuts for unite, adding folding