fixed for spree update
Merge branch 'rails-3-compat' of https://github.com/ginlane/spree_importer into rails-3-compat