Fix vim class name
Merge branch 'master' into grapefruit