Merge branch 'dev'
Allow 'overrides' within the '.env' file
Merge pull request #22 from Birdback/allow-overrides

Allow overrides