Update for Django 1.6, add custom user support, and some whitespace fixups