Django 1.5 fix, PEP fixes
Merge pull request #2 from ebu/develop

Django 1.5 fix, PEP fixes