Merge pull request #145 from rickcarlino/master

Minor changes to S3 uploader (WIP), Documentation updates