Sketching out s3 storage
Merge branch 'master' into s3

Merging master into current branch
Test fixes
s3 changes to get it all working
S3 doc changes
Adding s3 tests
More s3 tests
Documentation changes