Merge pull request #22 from snazy2000/master

Added Twitch and nearly working vimeo
add twitch to solution
Merge pull request #7 from MediaBrowser/master

Update