Do not overwrite config with ENV if ENV variable not present
Merge pull request #162 from marcgg/ability-override-env

Do not overwrite config with ENV if ENV variable not present