Made TripId unique

There are cases where two buses are on the same trip. Having two
updates for one trip is invalid, so just use the most recent bus to
checkin. Need to investigate this case more.