Make the tests pass with Django@master; hopefully we can remove all of it when Django 1.7 arrives