Do not push the .env file
Merge remote-tracking branch 'origin/master' into s3_website_monadic

Conflicts:
	changelog.md
	lib/s3_website/upload.rb
	s3_website.gemspec
	spec/lib/upload_spec.rb