Merge branch 'master' of github.com:redguardtoo/emacs.d

* 'master' of github.com:redguardtoo/emacs.d:
  snippet for fieldset added
use json-mode