Issue #2:  Shopping cart integration

Re-order the points at which the multiship and multiship_observer
classes are instantiated to account for the earlier processing of
shopping_cart actions.
Re-sync required

Some of the files recently downloaded had different whitespace
characteristics.