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).