Beginnings of the django-nonrel switch.
Fixed all the nonrel things.