fixed some discrepencies from merging master into feat/setup-config
fixed some discrepencies from merging master into feat/setup-config

Signed-off-by: Matthew Roseman <2bbb50079bc8963f26f9d3748c05817cb4e704c7@gmail.com>

stohio/software-lab,stohio/software-lab,stohio/software-lab