Tidied up service definitions, minor fixes
Merge branch 'master' of https://github.com/richardspiers/USPS