Switched vim config to that used by spf13
Merge branch 'master' of github.com:robharrop/dotfiles