please merge Joshua branch. 

I've added in the sample tweet into the stream and enclosed the tweet-template in script tags at the bottom.