Add vim-json
Merge branch 'master' into linux