Merge branch 'data_factory_rework' of github.com:smwesten-usgs/swb into data_factory_rework