Revise vim-json loading
Merge branch 'master' into mac