support django 1.5
additional django 1.5 compatibility fixes
SECRET_KEY now required
Merge branch 'django1.5'