Merge branch 'moviefap' of https://github.com/gebn/youtube-dl into gebn-moviefap

diff --combined youtube_dl/extractor/__init__.py
index c0a825e8a9b8b294f92a72abc1796e1283208e27,b70c1b57ed27e3ea79a764ce544dd38d443664cb..d41d277c91b5bd712d788793a33be1f0a1e5f395
--- 1/youtube_dl/extractor/__init__.py
--- 2/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -311,6 -311,7 +311,7 @@@ from .morningstar import MorningstarI
  from .motherless import MotherlessIE
  from .motorsport import MotorsportIE
  from .movieclips import MovieClipsIE
+ from .moviefap import MovieFapIE
  from .moviezine import MoviezineIE
  from .movshare import MovShareIE
  from .mtv import (
@@@ -621,7 -622,6 +622,7 @@@ from .twitch import 
      TwitchBookmarksIE,
      TwitchStreamIE,
  )
 +from .twitter import TwitterCardIE
  from .ubu import UbuIE
  from .udemy import (
      UdemyIE,