Fixed file indent problems, fixed ctrlp
Merge branch 'master' of https://github.com/ianwitherow/dotvim-linux