Merge branch 'akirk-nowtv'

diff --combined youtube_dl/extractor/__init__.py
index 80c9cb10753891463ff78f9fcb8fa1a0ccb3545d,17248ccea79fcc98d7526ad4f3e9ee51ab562194..3c1e8d5269568b19a08f804247517dde55256e8c
--- 1/youtube_dl/extractor/__init__.py
--- 2/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -149,6 -149,7 +149,6 @@@ from .extremetube import ExtremeTubeI
  from .facebook import FacebookIE
  from .faz import FazIE
  from .fc2 import FC2IE
 -from .firedrive import FiredriveIE
  from .firstpost import FirstpostIE
  from .firsttv import FirstTVIE
  from .fivemin import FiveMinIE
@@@ -354,6 -355,7 +354,7 @@@ from .normalboots import NormalbootsI
  from .nosvideo import NosVideoIE
  from .novamov import NovaMovIE
  from .nowness import NownessIE
+ from .nowtv import NowTVIE
  from .nowvideo import NowVideoIE
  from .npo import (
      NPOIE,
@@@ -437,7 -439,6 +438,6 @@@ from .roxwel import RoxwelI
  from .rtbf import RTBFIE
  from .rte import RteIE
  from .rtlnl import RtlNlIE
- from .rtlnow import RTLnowIE
  from .rtl2 import RTL2IE
  from .rtp import RTPIE
  from .rts import RTSIE
@@@ -479,6 -480,7 +479,6 @@@ from .smotri import 
      SmotriBroadcastIE,
  )
  from .snotr import SnotrIE
 -from .sockshare import SockshareIE
  from .sohu import SohuIE
  from .soundcloud import (
      SoundcloudIE,