Django 1.4.3

Merging in changes from Divio so that I can try and get our code running with django 1.4.3