some pretty bad/pervasive calculation errors
Merge pull request #55 from dimagi/calculation-fixes

some pretty bad/pervasive calculation errors