nrepl -> cider
Merge branch 'master' of github.com:tobytripp/emacs.d

Conflicts:
	lib/clojure.el
Clean up packages