allow for backfilling of events by specifying timestamp

In the docs you can specify a timestamp for events for the purposes of backfilling:
http://customer.io/docs/importing-old-data.html

The previous code base would take a timestamp argument and put it in the data portion of the event instead of at the toplevel. This change prevents using both timestamp and data['timestamp']