Add support for py3k and Django 1.5 - closes #6