removing override/gnus
re-added gnus submodule
resolved conflict with .gitmodules
Merge branch 'master' of github.com:dhaley/dot-emacs
merge conflict
adding to .gitignore