Add s3 storage
Merge branch 'master' of github.com:dopplesoldner/manhattan