Merge branch 'dev'

* dev:
  Added vim-json plugin
added alert and confirm globals to jshintrc
Merge branch 'master' into dev

* master: added alert and confirm to master, merge to dev
  added alert and confirm globals to jshintrc