protect against nil cost_price
Only redirect for html requests
Update merge! method within order_decorator to match the syntax of merge! in the order model of spree_core.
undoes the undoing of option.presentation for option.description
Merge pull request #87 from jfields/spree-2-1-wip

Update merge! method within order_decorator to match the syntax of merge...
Merge pull request #85 from dbwinger/master

Only redirect for html requests
beta work on using the 'new' order populator
Merge branch 'master' of github.com:jsqu99/spree_flexi_variants into spree-2-1-wip
fixes merge conflict
more versioning to get right w/ spree 2.1.  Also, added a no_charge calculator
adds missing files
adds testing improvements
made some possibly-unecessary changes to the way the calculators are set up
Merge pull request #3 from jsqu99/spree-2-1-wip

jsqu99 2.1 changes ~> charredutensil 2.1 changes