some todos removed which have been completed
resolve conflict in spec/controllers/spree/checkout_controller_decorator_spec.rb
two todos removed as they have been completed