emacs: nick coloring in erc
Merge branch 'master' of github.com:jonEbird/dotfiles

Conflicts:
	.aspell.en.pws