Split some configuration parameters out of application.conf
Merge remote-tracking branch 'origin/master'