Rework the test settings shortcut in manage.py
Rework the test settings shortcut in manage.py

This makes it possible to have test settings, but also use
DJANGO_SETTINGS_MODULE without the two interfering with one another.

willkg/harold,willkg/harold