Local vim updates.
Merge branch 'master' of https://github.com/coyote240/dotfiles
Merge, fix conflicts.