Only redirect for html requests
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