Bumped some vim plugins.
Merge branch 'master' into osx