Updating for Django 1.5 support