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

* 'data_factory_rework' of github.com:smwesten-usgs/swb:
  Convert to type-bound procedures in data_catalog module.
  Broke up "data factory" and renamed to two new modules: data_catalog, and data_catalog_entry.