Add #guix to autojoins.
Merge branch 'master' of github.com:davexunit/.emacs.d

Conflicts:
	erc.el