Optional tax calculated on shipping
Update dependencies.
Minor template changes.