Merge remote-tracking branch 'diffycat/master'

diff --combined youtube_dl/extractor/__init__.py
index b0df1cef7ac7707b0f95e222ac47b49da0dd864d,a30de30337843ec93424a0c42b044a92af986a3a..ffb74df9f36a623cd0abd8cf744923e6e63cc4f0
--- 1/youtube_dl/extractor/__init__.py
--- 2/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -1,5 -1,6 +1,6 @@@
  from .appletrailers import AppleTrailersIE
  from .addanime import AddAnimeIE
+ from .anitube import AnitubeIE
  from .archiveorg import ArchiveOrgIE
  from .ard import ARDIE
  from .arte import (
@@@ -25,7 -26,6 +26,7 @@@ from .comedycentral import ComedyCentra
  from .condenast import CondeNastIE
  from .criterion import CriterionIE
  from .cspan import CSpanIE
 +from .d8 import D8IE
  from .dailymotion import (
      DailymotionIE,
      DailymotionPlaylistIE,
@@@ -117,10 -117,7 +118,10 @@@ from .slashdot import SlashdotI
  from .slideshare import SlideshareIE
  from .sohu import SohuIE
  from .soundcloud import SoundcloudIE, SoundcloudSetIE, SoundcloudUserIE
 -from .southparkstudios import SouthParkStudiosIE
 +from .southparkstudios import (
 +    SouthParkStudiosIE,
 +    SouthparkDeIE,
 +)
  from .space import SpaceIE
  from .spankwire import SpankwireIE
  from .spiegel import SpiegelIE
@@@ -133,7 -130,6 +134,7 @@@ from .techtalks import TechTalksI
  from .ted import TEDIE
  from .tf1 import TF1IE
  from .thisav import ThisAVIE
 +from .toutv import TouTvIE
  from .traileraddict import TrailerAddictIE
  from .trilulilu import TriluliluIE
  from .tube8 import Tube8IE