Updated vim settings
Merge branch 'master' of github.com:djwolfe/dotfiles