Update to shipper cost override
Merge branch 'master' of https://github.com/olsonkr/JPMC