Fixes #13 .env overrides .env.#{environment}
Merge branch 'fix_env_override2'

Conflicts:
	lib/dotenv/deployment.rb