added some more vim plugins
Merge branch 'master' into work