updated erc config
Merge branch 'master' of github.com:jagguli/dotemacs
added emacs-jabber as submodule
Merge branch 'master' of github.com:jagguli/dotemacs
Merge branch 'master' of github.com:jagguli/dotemacs
updated erc settings
Merge branch 'master' of github.com:jagguli/dotemacs