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

* 'master' of github.com:redguardtoo/emacs.d:
  use json-mode
use web-mode
org-clock
snippet for log array in js