updated config stuff
Merge branch 'master' of https://github.com/CampbellGroup/common