refactoring
json-mode, volatile-highlights
Merge branch 'master' of github.com:tanimichi/dot.emacs.d

Conflicts:
	init.el
	init.elc