Config cleanup

@johnlockwood-wf Just an FYI as I'm working through preparations for using some of this config stuff.  Let me know if you spot anything wonky.


@tannermiller-wf @ericolson-wf @beaulyddon-wf