Merge remote-tracking branch 'Fnordlab/chilloutzone'

diff --combined youtube_dl/extractor/__init__.py
index a13b5cfb8ea957e2f50b9c2216b537580e391ee4,02a422fe62cb4a759c0b39ae1f7d41f0856f6724..c0a57c73d860d2320ed60126ef69d8a5e1660fec
--- 1/youtube_dl/extractor/__init__.py
--- 2/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -25,6 -25,7 +25,7 @@@ from .canalplus import CanalplusI
  from .canalc2 import Canalc2IE
  from .cbs import CBSIE
  from .channel9 import Channel9IE
+ from .chilloutzone import ChilloutzoneIE
  from .cinemassacre import CinemassacreIE
  from .clipfish import ClipfishIE
  from .cliphunter import CliphunterIE
@@@ -142,10 -143,8 +143,10 @@@ from .myvideo import MyVideoI
  from .naver import NaverIE
  from .nba import NBAIE
  from .nbc import NBCNewsIE
 +from .ndr import NDRIE
  from .ndtv import NDTVIE
  from .newgrounds import NewgroundsIE
 +from .nfb import NFBIE
  from .nhl import NHLIE, NHLVideocenterIE
  from .niconico import NiconicoIE
  from .ninegag import NineGagIE