Incorporates changes from pull request 48

Nothing different here, just making it merge cleanly.

See: https://github.com/Shopify/active_shipping/pull/48