Merge pull request #2 from ministryofjustice/more_config_opts

Allow override of per-service defaults; clean supervisor.d dir
Merge branch 'master' into more_config_opts