Improved MerchantWarrior gateway

This one can be closed: https://github.com/Shopify/active_merchant/pull/541

All changes from comments are in.