cleaned up clojure editing.
prettier code for loading packages
Merge branch 'master' of github.com:finnjohnsen/emacs.d

Conflicts:
	setup-nrepl-autotest.el