Django 1.5

This should finish the update to Django 1.5.

sorry the commits aren't squashed; doing it all though github's UI.