Fix vim command
Merge branch 'master' into chewbacca