stuff
bunch of stuff
Merge branch 'master' of github.com:mbriggs/.emacs.d

* 'master' of github.com:mbriggs/.emacs.d:
  stuff

Conflicts:
	init/init-clojure.el