Sorted django admin issue
Merge pull request #7 from danny-dyers-chocolate-homunculus/charlie

Sorted django admin issue
rebased master on joe