Streamlined settings. Removed test settings and moved defaults to settings.py