Get testing via django to a working state.
Merge branch 'working_django_tests' into develop