Merge remote-tracking branch 'JohnyMoSwag/master'

diff --combined youtube_dl/extractor/__init__.py
index 229bdc595f81f2a193cbf2661333491201684b97,6377f8b4ced69114c94b6af154d19a0fd98d32bb..ad90a0b9161dcbd8826a1145ab920efaa489228d
--- 1/youtube_dl/extractor/__init__.py
--- 2/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -186,7 -186,6 +186,7 @@@ from .rutube import 
      RutubeMovieIE,
      RutubePersonIE,
  )
 +from .savefrom import SaveFromIE
  from .servingsys import ServingSysIE
  from .sina import SinaIE
  from .slashdot import SlashdotIE
@@@ -225,6 -224,7 +225,7 @@@ from .tinypic import TinyPicI
  from .toutv import TouTvIE
  from .traileraddict import TrailerAddictIE
  from .trilulilu import TriluliluIE
+ from .trutube import TruTubeIE
  from .tube8 import Tube8IE
  from .tudou import TudouIE
  from .tumblr import TumblrIE