Add resupply_quantity and fix consumption issues

Previously some of this was treating consumption as a monthly value.
Merge pull request #186 from dimagi/consumption

Add resupply_quantity and fix consumption issues