Add vim enmasse
Merge branch 'master' into apricot