Make sure Upload.content_type is not ignored

Looks like there's a bazillion methods of specifying files you want to
upload with a form, and I missed one of them.  This adds a missing test
case and fixes the bug.

A followup fix for issue #86.