Merge remote-tracking branch 'ralfharing/vh1'

diff --combined youtube_dl/extractor/__init__.py
index ace298fb3523253c00de5ed96b2fb4a1509a9123,3e3d99b3e9c790bd8ae183edf80510634690a4d4..01c21189b548847ae3232ba4e3f85344d986b430
--- 1/youtube_dl/extractor/__init__.py
--- 2/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -142,7 -142,6 +142,7 @@@ from .khanacademy import KhanAcademyI
  from .kickstarter import KickStarterIE
  from .keek import KeekIE
  from .kontrtube import KontrTubeIE
 +from .ku6 import Ku6IE
  from .la7 import LA7IE
  from .lifenews import LifeNewsIE
  from .liveleak import LiveLeakIE
@@@ -195,10 -194,7 +195,10 @@@ from .normalboots import NormalbootsI
  from .novamov import NovaMovIE
  from .nowness import NownessIE
  from .nowvideo import NowVideoIE
 -from .nrk import NRKIE
 +from .nrk import (
 +    NRKIE,
 +    NRKTVIE,
 +)
  from .ntv import NTVIE
  from .nytimes import NYTimesIE
  from .nuvid import NuvidIE
@@@ -259,21 -255,13 +259,21 @@@ from .southparkstudios import 
  from .space import SpaceIE
  from .spankwire import SpankwireIE
  from .spiegel import SpiegelIE
 +from .spiegeltv import SpiegeltvIE
  from .spike import SpikeIE
  from .stanfordoc import StanfordOpenClassroomIE
  from .steam import SteamIE
  from .streamcloud import StreamcloudIE
  from .streamcz import StreamCZIE
 +from .swrmediathek import SWRMediathekIE
  from .syfy import SyfyIE
  from .sztvhu import SztvHuIE
 +from .tagesschau import TagesschauIE
 +from .teachertube import (
 +    TeacherTubeIE,
 +    TeacherTubeClassroomIE,
 +)
 +from .teachingchannel import TeachingChannelIE
  from .teamcoco import TeamcocoIE
  from .techtalks import TechTalksIE
  from .ted import TEDIE
@@@ -306,6 -294,12 +306,12 @@@ from .veehd import VeeHDI
  from .veoh import VeohIE
  from .vesti import VestiIE
  from .vevo import VevoIE
+ from .vh1 import (
+     VH1EpisodeIE,
+     VH1ClipIE,
+     VH1ShortUrlIE,
+     VH1MusicVideoIE
+ )
  from .viddler import ViddlerIE
  from .videobam import VideoBamIE
  from .videodetective import VideoDetectiveIE