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