Added Amazon-s3 storage for Paperclip if environmental variables are defined.
Merge branch 'develop-nick' into develop