Add support for updated versions of vim
Merge branch 'master' of github.com:metral/vimrc