Bug 836106: Ensure basket data is in sync with ET.

Fix issue with 500 errors on ET errors.
Merge pull request #15 from pmclanahan/keep-users-in-sync

Bug 836106: Ensure basket data is in sync with ET.