Adds additional logic to content type extraction routine

This now first checks the uploaded file for a 'Content-Type' value,
then looks for the form field 'content-type' that s3 supports.

This will allow new browsers that support the File object to work
but also allow for overrides when needed.