Added paperclip and aws/s3 upload support