[dev] Merk update

[Chuck Hagenbuch]

Quoting Duck <duck at obala.net>:

> - clean up nested spaces in the code
> - checkout and invoice templates clean up
> - stores the tax total value in the invoice table
> - correctly display tax in checkout, invoice and invoice print view
> - fix state/country mix in the invoice print view

Nice clean patch - committed, thanks.

-chuck

-- 
"But she goes not abroad in search of monsters to destroy." - John 
Quincy Adams