Adjust json setting
Merge branch 'master' of github.com:rcmachado/vimfiles
Update plugins