Re-configuring environment
Merge pull request #2 from kcschulz-usgs/master

EQH-2043, EQH-2046, EQH-2048