Starting to add Amazon S3 support
Merge branch 'amazons3'