Renaming, making sure proper values are used in templates for amounts
Goal -> total_cost
Merge pull request #179 from cmc333333/numbers

Fixes to goals/totals/etc.