change dependency to allow Spree 2.1
initial 2.0 changes, at least get the app to start
get product customizations working on spree 2.1 / rails 4
get ad hoc options working on spree 2.0 / rails 4
vix ad hoc options
use correct function to draw routes
use actual correct method this time
fix layout of products page
fix columns correctly
fix styling on product cart form
fix crash on engraving calculator cost = 0, use descriptions for customizations, tweak cart presentation
accidentally committed two files
protect against nil cost_price
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...
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