Fix overriding of config from env vars.
Merge pull request #285 from glowe/gl/fix-config-envar-override

Fix overriding of config from env vars.