Modify image uploader to save images in S3
Merging from heroku master