Cider integration
Merge branch 'master' of https://github.com/ilikedata/.emacs

Conflicts:
	init.el