Move os.GetEnv stuff out of api
Merge branch 'master' of defra:/houst0n/vcd

Conflicts:
	api.go