Fixes a load issue with specific .env files in Rails apps
Fixes #13 .env overrides .env.#{environment}
Allow *.env.#{environment} files
Merge branch 'fix_env_override2'

Conflicts:
	lib/dotenv/deployment.rb
Use Dir.pwd instead of File.absolute_path
Merge pull request #22 from liquid1982/master

Fixes a load issue with specific .env files in Rails apps
Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/dotenv/deployment.rb