Merge remote-tracking branch 'yasoob/master'

diff --combined youtube_dl/extractor/__init__.py
index 934419c4343a9d078ceffa7c91be9a21b4600888,d2a71a6f10d9aa6125348d722064ccf7fc89ce92..4b67f333b03776a759724c7e0bf52791cf608179
--- 1/youtube_dl/extractor/__init__.py
--- 2/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -13,6 -13,7 +13,7 @@@ from .dailymotion import DailymotionI
  from .depositfiles import DepositFilesIE
  from .dotsub import DotsubIE
  from .dreisat import DreiSatIE
+ from .ehow import EhowIE
  from .eighttracks import EightTracksIE
  from .escapist import EscapistIE
  from .facebook import FacebookIE
@@@ -58,7 -59,6 +59,7 @@@ from .tumblr import TumblrI
  from .tutv import TutvIE
  from .ustream import UstreamIE
  from .vbox7 import Vbox7IE
 +from .veoh import VeohIE
  from .vevo import VevoIE
  from .vimeo import VimeoIE
  from .vine import VineIE