uploads working with new gem. see the s3_multipart readme for more info
minor fixes
fixing merge conflicts
more minor fixes
Merge pull request #137 from maxgillett/new_upload_integration

uploads working with new gem. see the s3_multipart readme for more info