Getting the env stuff tests in a better place
Merge pull request #44 from travis-ci/env-tests

Getting the env stuff tests in a better place