allow specifying of expected group_by types
Merge pull request #44 from dimagi/group_by_type

allow specifying of expected group_by types
Merge branch 'master' into all_indicators

Conflicts:
	fluff/__init__.py