merge in changes from github.com/spree/spree_usa_epay