c
Merge branch 'master' of github.com:JamesYuan/emacs.d
Merge branch 'master' of github.com:purcell/emacs.d
Merge branch 'master' of github.com:JamesYuan/emacs.d
Merge branch 'master' of github.com:JamesYuan/emacs.d
Remove spurious "q" (thanks @bradleywright)
Merge branch 'master' of github.com:JamesYuan/emacs.d
Use js-mode and flymake-json for .json files
Merge branch 'master' of github.com:purcell/emacs.d