Update merge! method within order_decorator to match the syntax of merge! in the order model of spree_core.
Merge pull request #87 from jfields/spree-2-1-wip

Update merge! method within order_decorator to match the syntax of merge...