Increased dependency to allow 2.1 and updated the related spree 2.1 changes