Django 1.5 prep

These are the changes that are required to get Fjord working with Django 1.5. I'll update Fjord to Django 1.5 after I land the Django 1.5 changes in playdoh-lib.

Figure I might as well land these individually.

r?