Merge remote-tracking branch 'MikeCol/goshgay'

diff --combined youtube_dl/extractor/__init__.py
index 7b3f9ae24b41c8057d654c2f3142fc1a105441bc,e8598a2f5ba40f1f3c53720c4605a3e3adf1d44b..f43f3f7024963b9d9b3e3c7ab00ba7582ee125b6
--- 1/youtube_dl/extractor/__init__.py
--- 2/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -112,6 -112,7 +112,7 @@@ from .generic import GenericI
  from .googleplus import GooglePlusIE
  from .googlesearch import GoogleSearchIE
  from .gorillavid import GorillaVidIE
+ from .goshgay import GoshgayIE
  from .hark import HarkIE
  from .helsinki import HelsinkiIE
  from .hentaistigma import HentaiStigmaIE
@@@ -342,7 -343,6 +343,7 @@@ from .vine import 
  )
  from .viki import VikiIE
  from .vk import VKIE
 +from .vodlocker import VodlockerIE
  from .vube import VubeIE
  from .vuclip import VuClipIE
  from .vulture import VultureIE