Updated TODO with Twitter.
Added twitter sream
Fixed merge conflicts