change total column calculations
Merge pull request #1571 from dimagi/gsid_totals

change total column calculations