Removed merge artifacts
Changed erc settings
Merge branch 'org' of github.com:fizban007/emacs.d into org