updates tweet model, still needs a method for dealing with favorites and retweets
fixes merge