working on some configuration changes.
continuing work on config and assets.
Merge branch 'master' into config
Merge branch 'master' into config
Cleaning up config. Remove workbench.

In prep for workbench being a separate CLI tool.
Continue to tweak things for workbench changes.