Merge branch 'viki-shows' of https://github.com/ping/youtube-dl into ping-viki-shows

diff --combined youtube_dl/extractor/__init__.py
index 8c28cdc71bb3419d4b6d946c0be8afccc3d3eab5,21f7b7290670a7d5b562df4f3d557238ad1f745f..173e9a15515a2a8325d7e86bb053bb3f3beded5e
--- 1/youtube_dl/extractor/__init__.py
--- 2/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -141,7 -141,6 +141,7 @@@ from .engadget import EngadgetI
  from .eporner import EpornerIE
  from .eroprofile import EroProfileIE
  from .escapist import EscapistIE
 +from .espn import ESPNIE
  from .everyonesmixtape import EveryonesMixtapeIE
  from .exfm import ExfmIE
  from .expotv import ExpoTVIE
@@@ -377,10 -376,7 +377,10 @@@ from .nytimes import 
  from .nuvid import NuvidIE
  from .odnoklassniki import OdnoklassnikiIE
  from .oktoberfesttv import OktoberfestTVIE
 -from .ooyala import OoyalaIE
 +from .ooyala import (
 +    OoyalaIE,
 +    OoyalaExternalIE,
 +)
  from .openfilm import OpenFilmIE
  from .orf import (
      ORFTVthekIE,
@@@ -645,7 -641,7 +645,7 @@@ from .vine import 
  )
  from .viki import (
      VikiIE,
-     VikiShowIE,
+     VikiChannelIE,
  )
  from .vk import (
      VKIE,