Bring branch up to date with global config changes.
Merge pull request #2 from hjoliver/204.suite-env-file

Bring branch up to date with global config changes.