Shipping total is being properly calcualated now so include in total. fixes #14