changes to erc
Merge branch 'master' of github.com:attichacker/dotemacs