Merge remote-tracking branch 'mjorlitzky/master'

diff --combined youtube_dl/extractor/__init__.py
index 37bf8e306b6be90c174b115dd8ff2ef98b04ce84,bd16f0f3e43d85932015af15c157dd23f0cb6f9a..41b6289a5f95cde7b1814107bd8bddd172c65c0b
--- 1/youtube_dl/extractor/__init__.py
--- 2/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -20,7 -20,6 +20,7 @@@ from .brightcove import BrightcoveI
  from .c56 import C56IE
  from .canalplus import CanalplusIE
  from .canalc2 import Canalc2IE
 +from .cbs import CBSIE
  from .cinemassacre import CinemassacreIE
  from .clipfish import ClipfishIE
  from .clipsyndicate import ClipsyndicateIE
@@@ -112,6 -111,7 +112,7 @@@ from .orf import ORFI
  from .pbs import PBSIE
  from .photobucket import PhotobucketIE
  from .podomatic import PodomaticIE
+ from .pornhd import PornHdIE
  from .pornhub import PornHubIE
  from .pornotube import PornotubeIE
  from .pyvideo import PyvideoIE