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

diff --combined youtube_dl/extractor/__init__.py
index 6b19eb6f822f2ef4cacf012b06998e281c2d08c4,cb6635610c921bb4f74264c3ed97aff60ba31a5a..8c28cdc71bb3419d4b6d946c0be8afccc3d3eab5
--- 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,
@@@ -643,7 -639,10 +643,10 @@@ from .vine import 
      VineIE,
      VineUserIE,
  )
- from .viki import VikiIE
+ from .viki import (
+     VikiIE,
+     VikiShowIE,
+ )
  from .vk import (
      VKIE,
      VKUserVideosIE,