Updated contrib_category models to utilize django-mptt

And some minor MRO fixes.