tweaking twitter_stream
merge conflicts