Removed job code
Merged master
Changed back to defaults
New config options
Merge branch 'master' into optus
Returned optus settings