Vim updates
Merge branch 'master' of github.com:njbair/dotfiles