More Worldpay Nightly Audit Cleanup

* Changes to the queue messages (removing original_ keys; they
apparently make q2c go nuts)
* cleanup around the integration of contribution tracking data
* command-line echo cleanup

Change-Id: I05c3460425028d9deaf93c0bdf56110afc437aa0