Fix django deprecations

Fixing some stuff I've encountered when running with <del>scissors</del> Django 1.5.1