we should support png at least
adding test to confirm that we'll pass through the content type of any file now
Merge pull request #6 from steder/support-png

Support for JPEG/PNG conversion and pass through for content types instead of the hard-coded assumption that everything is 'image/jpeg'