update to version 2.2 of spree

Hi @kwanso

I've committed changes required to work with the current spree master (2.2). Feel free to review and merge.

Thanks