Add initial work to support Django 1.5 and py3k