Add vim-jplus option variables
Merge branch 'master' into linux
Add ignore-pattern of sh_comment
Merge branch 'master' into linux