fixes to work with django 1.6: fix imports, use content_type

this fixes an import error, and gets rid of deprecation warning.