change vim mode
Merge branch 'master' into cygwin