Fixup stuff for django 1.5 and comment out a few things