Bring branch up to date with global config changes.

Matt, I updated your branch so I could test it. Have left the env file location the same though, pending the outcome of our discussion on that.