additional django 1.5 compatibility fixes
support for python 3.3
Merge branch 'django1.5'
Merge branch 'py3k'