Remove Address#phone_validate which is not being used.
Fix phone number for my ocd.
Remove commented out code that is no longer valid.
attr_accessible :country_id is duplicated

[Fixes #3114]
Make sure that the images aren't CMYK. [Fixes #3104]
No need to pass option on spree.promo initializer

For some reason this was making the calculator.shipping_methods nil in
the spree app initializer. It prevented users from adding their own
calculators with code like:

  Rails.application.config.spree.calculators.shipping_methods << CustomUserClass

Fixes #3118
Deprecate Order#shipment as split_shipments makes it less relevant
Stop using deprecated Order#shipment method in OrderInventory spec