Add vim-jplus
Merge branch 'master' into linux