Merging django in to work

Sharing the night's work