Update care iact indicators

IPT/Bactrim/etc values show up on two seperate form types, I was
previously using the wrong ones.

Also removed a bunch of remaining TODO comments that I was using to
track which indicators I added but was unable to get data out of (as I'm
getting data from everything at this point).
Merge branch 'master' into care-iact-indicators

Conflicts:
	custom/reports/care_sa/reports/sql.py
Merge pull request #1079 from dimagi/care-iact-indicators

Update care iact indicators