Revert "Revert "Revert "do not mark arrived if at usps"""
Revert "Revert "Revert "do not mark arrived if at usps"""

This reverts commit 324dcde3dd17db3c197ec03b80a8e64d4a8ef56d.

fiestacasey/omniship,wantable/omniship