fixes small problems with getting the master-branch running under Django 1.4.1, Python 2.7.3