Merge pull request #42 from swem/master

match videoId of ustream without query string