Support environment variables and better handle config from file
Merge branch 'master' of https://github.com/stucco/collectors.git

Conflicts:
	src/main/java/gov/pnnl/stucco/utilities/FileReceiver.java