Fixes setting metadata when loading files to Amazon S3 (PR 266)
Merge pull request #266 from xaben/contenttypefix

Fix passing the correct content-type to Amazon S3