Added timeout to fake streaming code
Merge branch 'master' of github.com:paulbooth/entrance