Diff fix

note, that this includes commits from https://github.com/dimagi/auditcare/pull/8, so don't review this till the the cleanups are done - just putting them here to make review non blocking.