Automatically changed by Emacs
Some el-get remnants
Removing and adding some feeds
Merge branch 'master' of github.com:mrvdb/emacs-config

* 'master' of github.com:mrvdb/emacs-config:
  Basic working IMAP connection with GNUS
  ws-butler can not be enabled globally
  use-package does not need a quote for the package
  Disable scad mode for now until I get it into an el-get recipe