refactor
merge conflict
add usps controller
cleanup
add shipper model to consolidate requests to carriers
renamed controllers to shipper
Merge pull request #6 from Elffers/carrier

Carrier looks good!