Allow spree_core to handle merging guest orders

Fixes #100