Improve when <> autocloses, add vim-json