nrepl setup
Merge branch 'master' into nrepl
Merge branch 'master' into nrepl

Conflicts:
	config/erc.el
cleanup