Work on Clojure env
Merge branch 'develop' of github.com:aaronc/emacs.d into develop

Conflicts:
	init.el