Make this work on Spree 2.0.0.beta

We seem to also be passing around Spree::Shipment objects in 2.0