Add more erc buffer types to the erc buffer group
Cause magit-init to autoload magit
Merge branch 'master' of https://github.com/rdparker/emacs-config
Merge branch 'master' of https://github.com/rdparker/emacs-config