Merge pull request #1 from jwiegley/master

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