Merge pull request #25 from waltaskew/feature/s3-upload-redux

In which we improve S3 support in our API