Revise comment-out in vim-plugins
Merge branch 'master' into linux