Switch some bundles
Merge
Merge branch '3.0' of https://github.com/cloud171/vim into 3.0