Issue #22 - Final updates for S3 paperclip