Config cleanup

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