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

Move env variables to environment and environment_test
Merge remote-tracking branch 'origin/master' into added-geo-service

Conflicts:
	run.sh