Now config.js is REALLY just configuration
Merge branch 'feature/cleanconfig' into develop