Merge remote-tracking branch 'irtusb/vimple'

diff --combined youtube_dl/extractor/__init__.py
index f43f3f7024963b9d9b3e3c7ab00ba7582ee125b6,4b7900b4f101a8188b44504df955b0d5dee8c93c..44e1708ed8dfc2044062027caa3d82e20bf90e30
--- 1/youtube_dl/extractor/__init__.py
--- 2/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -3,7 -3,6 +3,7 @@@ from .addanime import AddAnimeI
  from .aftonbladet import AftonbladetIE
  from .anitube import AnitubeIE
  from .aol import AolIE
 +from .allocine import AllocineIE
  from .aparat import AparatIE
  from .appletrailers import AppleTrailersIE
  from .archiveorg import ArchiveOrgIE
@@@ -64,7 -63,6 +64,7 @@@ from .dailymotion import 
  from .daum import DaumIE
  from .dotsub import DotsubIE
  from .dreisat import DreiSatIE
 +from .drtv import DRTVIE
  from .defense import DefenseGouvFrIE
  from .discovery import DiscoveryIE
  from .divxstage import DivxStageIE
@@@ -111,8 -109,6 +111,8 @@@ from .gdcvault import GDCVaultI
  from .generic import GenericIE
  from .googleplus import GooglePlusIE
  from .googlesearch import GoogleSearchIE
 +from .gorillavid import GorillaVidIE
 +from .goshgay import GoshgayIE
  from .hark import HarkIE
  from .helsinki import HelsinkiIE
  from .hentaistigma import HentaiStigmaIE
@@@ -150,11 -146,7 +150,11 @@@ from .ku6 import Ku6I
  from .la7 import LA7IE
  from .lifenews import LifeNewsIE
  from .liveleak import LiveLeakIE
 -from .livestream import LivestreamIE, LivestreamOriginalIE
 +from .livestream import (
 +    LivestreamIE,
 +    LivestreamOriginalIE,
 +    LivestreamShortenerIE,
 +)
  from .lynda import (
      LyndaIE,
      LyndaCourseIE
@@@ -172,13 -164,11 +172,13 @@@ from .mpora import MporaI
  from .mofosex import MofosexIE
  from .mooshare import MooshareIE
  from .morningstar import MorningstarIE
 +from .motherless import MotherlessIE
  from .motorsport import MotorsportIE
  from .moviezine import MoviezineIE
  from .movshare import MovShareIE
  from .mtv import (
      MTVIE,
 +    MTVServicesEmbeddedIE,
      MTVIggyIE,
  )
  from .musicplayon import MusicPlayOnIE
@@@ -205,7 -195,6 +205,7 @@@ from .normalboots import NormalbootsI
  from .novamov import NovaMovIE
  from .nowness import NownessIE
  from .nowvideo import NowVideoIE
 +from .npo import NPOIE
  from .nrk import (
      NRKIE,
      NRKTVIE,
@@@ -227,7 -216,6 +227,7 @@@ from .pornotube import PornotubeI
  from .prosiebensat1 import ProSiebenSat1IE
  from .pyvideo import PyvideoIE
  from .radiofrance import RadioFranceIE
 +from .rai import RaiIE
  from .rbmaradio import RBMARadioIE
  from .redtube import RedTubeIE
  from .ringtv import RingTVIE
@@@ -264,7 -252,6 +264,7 @@@ from .soundcloud import 
      SoundcloudUserIE,
      SoundcloudPlaylistIE
  )
 +from .soundgasm import SoundgasmIE
  from .southparkstudios import (
      SouthParkStudiosIE,
      SouthparkDeIE,
@@@ -284,7 -271,7 +284,7 @@@ from .sztvhu import SztvHuI
  from .tagesschau import TagesschauIE
  from .teachertube import (
      TeacherTubeIE,
 -    TeacherTubeClassroomIE,
 +    TeacherTubeUserIE,
  )
  from .teachingchannel import TeachingChannelIE
  from .teamcoco import TeamcocoIE
@@@ -337,13 -324,13 +337,14 @@@ from .vimeo import 
      VimeoReviewIE,
      VimeoWatchLaterIE,
  )
+ from .vimple import VimpleIE
  from .vine import (
      VineIE,
      VineUserIE,
  )
  from .viki import VikiIE
  from .vk import VKIE
 +from .vodlocker import VodlockerIE
  from .vube import VubeIE
  from .vuclip import VuClipIE
  from .vulture import VultureIE
@@@ -358,7 -345,6 +359,7 @@@ from .weibo import WeiboI
  from .wimp import WimpIE
  from .wistia import WistiaIE
  from .worldstarhiphop import WorldStarHipHopIE
 +from .wrzuta import WrzutaIE
  from .xbef import XBefIE
  from .xhamster import XHamsterIE
  from .xnxx import XNXXIE