more versioning to get right w/ spree 2.1.  Also, added a no_charge calculator