Upgrade vim bundles
Merge branch 'master' into macosx