Upgrade to Django Development Branch

Changed mimetype to content_type in order to work with updates.
Refer to last

forgot one mimetype
Merge pull request #24 from zopsi/master

Minor update for Django Development Branch