Merge branch 'chirbit' of https://github.com/skypher/youtube-dl into skypher-chirbit

diff --combined youtube_dl/extractor/__init__.py
index 4d3e79de9d5caf0084ba3cadc609f50b747a3f89,cf58f080030efbc921acb51399c48cafe39d97f8..c3088fba2e7bad3e6e34ab2855f0f732937ba215
--- 1/youtube_dl/extractor/__init__.py
--- 2/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -63,6 -63,7 +63,7 @@@ from .ccc import CCCI
  from .ceskatelevize import CeskaTelevizeIE
  from .channel9 import Channel9IE
  from .chilloutzone import ChilloutzoneIE
+ from .chirbit import ChirbitIE, ChirbitProfileIE
  from .cinchcast import CinchcastIE
  from .clipfish import ClipfishIE
  from .cliphunter import CliphunterIE
@@@ -364,7 -365,6 +365,7 @@@ from .promptfile import PromptFileI
  from .prosiebensat1 import ProSiebenSat1IE
  from .pyvideo import PyvideoIE
  from .quickvid import QuickVidIE
 +from .r7 import R7IE
  from .radiode import RadioDeIE
  from .radiobremen import RadioBremenIE
  from .radiofrance import RadioFranceIE
@@@ -425,7 -425,10 +426,10 @@@ from .soundcloud import 
      SoundcloudUserIE,
      SoundcloudPlaylistIE
  )
- from .soundgasm import SoundgasmIE
+ from .soundgasm import (
+     SoundgasmIE,
+     SoundgasmProfileIE
+ )
  from .southpark import (
      SouthParkIE,
      SouthparkDeIE,
@@@ -491,7 -494,6 +495,7 @@@ from .tumblr import TumblrI
  from .tunein import TuneInIE
  from .turbo import TurboIE
  from .tutv import TutvIE
 +from .tv4 import TV4IE
  from .tvigle import TvigleIE
  from .tvp import TvpIE, TvpSeriesIE
  from .tvplay import TVPlayIE
@@@ -613,7 -615,6 +617,7 @@@ from .youtube import 
      YoutubeUserIE,
      YoutubeWatchLaterIE,
  )
 +from .zapiks import ZapiksIE
  from .zdf import ZDFIE, ZDFChannelIE
  from .zingmp3 import (
      ZingMp3SongIE,