Updated config
Added some comments for the config
Removed legacy configuration options
Merge branch 'develop' into integration/propel