Updating to be compatible with recent humfrey and Django 1.5