Updates required to work on Django 1.7

Sure. I didn't want to do too much pep8 changing but I can do a pass through.