Merge remote-tracking branch 'hojel/nuvid'

diff --combined youtube_dl/extractor/__init__.py
index 5095f14b620839170fbbe264b9810f1dc543ba93,287044180f8ba95f4e0643865867d0ca8bb13faf..84a1830d0201c2d1a91a79de49fa232947edd2b3
--- 1/youtube_dl/extractor/__init__.py
--- 2/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -79,7 -79,6 +79,7 @@@ from .exfm import ExfmI
  from .extremetube import ExtremeTubeIE
  from .facebook import FacebookIE
  from .faz import FazIE
 +from .fc2 import FC2IE
  from .firstpost import FirstpostIE
  from .firsttv import FirstTVIE
  from .fivemin import FiveMinIE
@@@ -195,6 -194,7 +195,7 @@@ from .nowvideo import NowVideoI
  from .nrk import NRKIE
  from .ntv import NTVIE
  from .nytimes import NYTimesIE
+ from .nuvid import NuvidIE
  from .oe1 import OE1IE
  from .ooyala import OoyalaIE
  from .orf import ORFIE
@@@ -231,7 -231,6 +232,7 @@@ from .scivee import SciVeeI
  from .servingsys import ServingSysIE
  from .sina import SinaIE
  from .slideshare import SlideshareIE
 +from .slutload import SlutloadIE
  from .smotri import (
      SmotriIE,
      SmotriCommunityIE,
@@@ -297,7 -296,6 +298,7 @@@ from .videodetective import VideoDetect
  from .videolecturesnet import VideoLecturesNetIE
  from .videofyme import VideofyMeIE
  from .videopremium import VideoPremiumIE
 +from .videott import VideoTtIE
  from .videoweed import VideoWeedIE
  from .vimeo import (
      VimeoIE,
@@@ -308,10 -306,7 +309,10 @@@
      VimeoReviewIE,
      VimeoWatchLaterIE,
  )
 -from .vine import VineIE
 +from .vine import (
 +    VineIE,
 +    VineUserIE,
 +)
  from .viki import VikiIE
  from .vk import VKIE
  from .vube import VubeIE
@@@ -320,7 -315,6 +321,7 @@@ from .washingtonpost import WashingtonP
  from .wat import WatIE
  from .wdr import (
      WDRIE,
 +    WDRMobileIE,
      WDRMausIE,
  )
  from .weibo import WeiboIE