Change change form override for two reasons:
1 - File path has changed in Spree 2
2 - Form object var is now just 'form' instead of 'ship_form'
Loosend dependency on spree_core
Use update_column to switch_ship_address_id to ensure it works
Copy address company name as well as other fields
Add support for spree 2.2.0.beta