Various Vim/MacVim updates.
Merge branch 'master' of https://github.com/lgw4/dotfiles