Updated vim packages
Merge remote-tracking branch 'origin/master'
Oops, forgot to merge earlyer commits