Update S3 model to latest version

Fixes #392.

cc @kyleknap @danielgtaylor