update abbrevation
Take care when restoring window layout after  magit-status
Add missing docstring
Remove defunct clojure font lock keywords

These were borrowed from Brian Carper, and are now (mostly?) redundant.
nrepl / clojure tweaks
Merge branch 'master' of git://github.com/purcell/emacs.d into next
Remove spurious "q" (thanks @bradleywright)
Use js-mode and flymake-json for .json files
disable python-mode
Merge branch 'master' of git://github.com/purcell/emacs.d