pushed tweets/messages into the trip model
merging changes