Config refactor - Merge global with provisioner local

Rebased and ready to go. Tested by hand and it should be fine. Someday we need to build out the testing harness for this stuff.