Caught an unfixed merge confilct.
Update info on loading different types of data and using environment variables.