Django 1.6 updates
Adds pizzapanther's fix for Django 1.6 : Thanks !
Fix trailings spaces