WIP - setdefault()s removed, tests broken
Merge branch 'notifier/filter-cohorts' of github.com:edx/notifier into notifier/filter-cohorts

Conflicts:
	notifier/tests/test_pull.py