Upgraded to Django 1.6

Did some PEP 8 fixes, too.