Screwed up django directory, sort it, add a test