Discounts + VAT

Fixes #59 and fixes #44 
Can this not make your VAT calculation incorrect again (rounding error?)