Merge branch 'ndr' of https://github.com/remitamine/youtube-dl into remitamine-ndr

diff --combined youtube_dl/extractor/__init__.py
index 2e7272931d618746f4105fbafcae47cb915ee091,84830c88556219cb26f8bb8e3c1e255c1965008f..44ab7ce3cd23ef6f75de985ff91f7162e37494c8
--- 1/youtube_dl/extractor/__init__.py
--- 2/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -347,6 -347,7 +347,6 @@@ from .mtv import 
  )
  from .muenchentv import MuenchenTVIE
  from .musicplayon import MusicPlayOnIE
 -from .musicvault import MusicVaultIE
  from .muzu import MuzuTVIE
  from .mwave import MwaveIE
  from .myspace import MySpaceIE, MySpaceAlbumIE
@@@ -367,6 -368,8 +367,8 @@@ from .nbc import 
  from .ndr import (
      NDRIE,
      NJoyIE,
+     NDREmbedIE,
+     NJoyEmbedIE,
  )
  from .ndtv import NDTVIE
  from .netzkino import NetzkinoIE
@@@ -432,6 -435,7 +434,6 @@@ from .ooyala import 
      OoyalaIE,
      OoyalaExternalIE,
  )
 -from .openfilm import OpenFilmIE
  from .orf import (
      ORFTVthekIE,
      ORFOE1IE,