More fixes to the test setup.
Merge branch 'master' of github.com:jezdez/django-configurations