carrier wave with S3
Merge branch 'develop' of https://github.com/cschrader/hcking into develop