fix wrong tax percentage in totals when invoice contains a discount
move tax totals right before grand total
Merge pull request #25 from quafzi/master

Fix some tax totals issues