Vim: Update plugins
Git: Remove references to old merge drivers (thanks @soulcutter)