Cleanups in preparation for Django 1.6
Merge pull request #1737 from washort/pre16

Cleanups in preparation for Django 1.6