Updated S3 support for https://github.com/spree/spree/pull/4139
Changed permalink to slug in accordance with spree switching to using the friendly_id gem
Merge pull request #58 from davekiss/paperclip_s3

Updated S3 support for https://github.com/spree/spree/pull/4139
Merge pull request #59 from davekiss/slug

Changed permalink to slug in accordance with friendly_id gem
Add missing end statement

Missed this in my conflict merge
Merge pull request #60 from davekiss/patch-1

Add missing end statement