Updating fork with changes originally written by https://github.com/timmyc/active_shipping/, but which were never accepted in a pull request by https://github.com/Shopify/active_shipping.
Merge pull request #84 from boontdustie/master

Incorporates changes from pull request 48