Django 1.5.x compatibility updates

sample_project tests should now all pass on Django 1.5.x