Added Lasership and removed Airborne

Added Lasership and removed Airborne. Added additional consistency
checks. Consolidated USPS express code.