Upgrade Vim plugins
Merge branch 'upgrade-vim-plugins'