vim: Use sensible names for plugins inside bundle
Merge remote-tracking branch 'origin/master' into linux