Fix to order and shipment mailers.

@radar Thanks for the updates you made. Added a few more tweaks to them.