Vim plugin changes.
Merge branch 'master' into HEAD