Improve extension for Spree 2.1 and above

Fixes #32