Modified settings structure
Added default settings
Merge branch 'prod' into crabfeed

Conflicts:
	meadowspta/meadowspta/settings-local.py
	meadowspta/meadowspta/settings-prod.py