Simplified reporting

This is branched off of https://github.com/dimagi/commcare-hq/pull/4571 and should not be merged first.
Err, yeah, that's probably not supposed to be like that (also that's not related to this PR, just the branch this is branched off of).