Django 1.7 fixes

These are changes that I had to make in order to run migrations with a project using Mezzanine and Django 1.7.