Update the S3 model to include VersionId and MFA on the DeleteObject operation.  Fixes https://github.com/aws/aws-cli/issues/346.
Merge branch 'update-s3-model' of git://github.com/garnaat/botocore into garnaat-update-s3-model