some fixes to work with django 1.6
Merge branch 'develop' of github.com:allink/pennyblack into develop