Better s3 support.
Merge branch 'master' of https://github.com/kraffslol/droplet