cleanup settings.py with more labels, attempted to gets tests running but broken ./manage.py test with nosetestsuiterunner