Updated S3 support for https://github.com/spree/spree/pull/4139

This should take care of https://github.com/halo/spree_digital/issues/57 - could use a second set of eyes!