Merge pull request #1 from benweatherman/master

Pulling down updates from master repo.
Fixed problem with ShipFrom state not being in output XML
Merge pull request #16 from htristan/master

Fix for ShipFrom not having a state code (caused invalid XML submission to UPS).