Updates required to make master compatible with current spree master (2.1.0.beta)

Title line says it all... let me know if there are any questions.
Cheers,
Sean

cc @BDQ