Also, 3.1.0 and 3.1.1 will be yanked because of the regression.

@mvz caught this in 90ea9dab.
Thank you!

This will solve an issue when using Paperclip without Active Record
such as Mongoid.

Fixes #919

This is for Rails 3.1+

Fixes #902

Fixes #883

Re-fix of #838, #766, #911

IMPORTANT: There is a bug in the current release of Fog (1.3.1) that will
return a broken expiring URL when the bucket name is valid for a subdomain.
This is fixed per https://github.com/fog/fog/pull/857 but not released
in the gem yet. I have added currently FAILING tests for these cases that
should pass when a new Fog is released.

This relates to #817

`#reverse_merge` did not work as planned because :default key was
already existed in the hash.

Actually trying to check what's being used in the method instead of
checking for something and use another thing. Thanks @jferris.