[justin.tv] Modernize (Fixes #2705)
Merge branch 'master' of github.com:rg3/youtube-dl