Give .env.production precedence over .env
Merge pull request #526 from opscode/dotenv-precedence

Give .env.production precedence over .env