Upgrade to Django 1.5.8 

Did a rebase with the same commits from https://github.com/openhatch/oh-mainline/pull/298