Lots of vim updates
Merge branch 'master' of github.com:andrew-d/dotfiles