fixed a few things with ups shipping label and added another prelim integrity test
express mail label working
fixed tests and also usps code that i hosed on friday
resolved merge conflicts