[novamov] Simplify
[justin.tv] Modernize (Fixes #2705)
Merge branch 'master' of github.com:rg3/youtube-dl
[cbsnews] Add support for cbsnews.com (Closes #2691)
[rts] Update test