Adding the missing cleaner
Fixing up config defaults
Merge branch 'master' into omnitropic

* master:
  Fixing up config defaults
  Adding the missing cleaner
Config updates