Timestamp

So this is currently backwards incompatible - either we bump to 3.0.x or we send `@timestamp` in the old format too. My preference would be for sending both.