Move env vars to environment and environment_test
Merge pull request #14 from LandRegistry/config-cleanup

Move env vars to environment and environment_test