Fixed a few issues I ran into trying to use mock-s3 for a project

I have a project that was passing all tests against S3, but failed when I injected mock-s3.  These commits fix all the problems I ran into.