Lots of Updates
Revert "Testing Amazon S3"

This reverts commit bb16db00c5b273e13395c95316cbaec3d43e118c.