Merge branch 'master' into care-reports

Conflicts:
	settings.py
Make grouping not super hacky anymore
Merge branch 'master' into care-reports
Bunch of random changes

Added 3rd report, fixed indicators, made "all age/gender" grouping
actually work
Merge branch 'care-reports' into staging2

Conflicts:
	settings.py