fix merge error in vimrc
Merge branch 'master' of github.com:jpalmer/dotfiles