Stuff
Erc
Merge branch 'master' of https://github.com/memeplex/home

Conflicts:
	.emacs
	.emacs.d/fixes.el
Emacs config