Fix business days

This includes some minor refactoring to clean up just the code that handles the delivery date calculations.  A larger refactoring is warranted, but I wanted to get this reviewed & shipped first.

@BlakeMesdag for review please.