update erc config
sync clojure-snippets
reorganize snippets
remove duplicates
move imports
Merge branch 'master' into nrepl

Conflicts:
	config/erc.el