Refactors combining addresses 2 and 3
Merge pull request #167 from Shopify/address_2_3_combined

Refactors combining addresses 2 and 3