Improve estimation calculation, take discounts and taxes into account.
Fix usage charges (total had no price components).
Fix incorrect subtotal.
Merge pull request #13 from jsacksick/improve_estimation

Improve estimation calculation, take discounts and taxes into account.