Started adding in tweetstream
Added in commented out code for streaming
complete merge