Switching from standard twitter-stream to a branch with better timeout handling