Merge remote-tracking branch 'dstftw/correct-valid-urls'

diff --cc youtube_dl/extractor/appletrailers.py
Simple merge

diff --cc youtube_dl/extractor/archiveorg.py
Simple merge

diff --cc youtube_dl/extractor/comedycentral.py
index 53579aa2703e78150c14dfe5dfd35e6240310952,caea446eab42d7484c62f2b08e50f54e27e8849c..a54ce3ee7c44727a9e56b1ab8359bd099b48bb35
--- 1/youtube_dl/extractor/comedycentral.py
--- 2/youtube_dl/extractor/comedycentral.py
+++ b/youtube_dl/extractor/comedycentral.py
@@@ -11,8 -11,8 +11,8 @@@ from ..utils import 
  )
  
  
 -class ComedyCentralIE(MTVIE):
 -    _VALID_URL = r'https?://(?:www\.)?comedycentral\.com/(video-clips|episodes|cc-studios)/(?P<title>.*)'
 +class ComedyCentralIE(MTVServicesInfoExtractor):
-     _VALID_URL = r'http://www.comedycentral.com/(video-clips|episodes|cc-studios)/(?P<title>.*)'
++    _VALID_URL = r'https?://(?:www.)?comedycentral.com/(video-clips|episodes|cc-studios)/(?P<title>.*)'
      _FEED_URL = u'http://comedycentral.com/feeds/mrss/'
  
      _TEST = {

diff --cc youtube_dl/extractor/dreisat.py
Simple merge

diff --cc youtube_dl/extractor/faz.py
Simple merge

diff --cc youtube_dl/extractor/gametrailers.py
index 3a8bef250fa8eddd89af54291228ec3909c1453c,88f65603188883d57f9c506331933bf6d9de16f2..d82a5d4b2a30578298080f03a8bba5f502e48f20
--- 1/youtube_dl/extractor/gametrailers.py
--- 2/youtube_dl/extractor/gametrailers.py
+++ b/youtube_dl/extractor/gametrailers.py
@@@ -1,11 -1,13 +1,10 @@@
  import re
  
 -from .mtv import MTVIE, _media_xml_tag
 +from .mtv import MTVServicesInfoExtractor
  
 -class GametrailersIE(MTVIE):
 -    """
 -    Gametrailers use the same videos system as MTVIE, it just changes the feed
 -    url, where the uri is and the method to get the thumbnails.
 -    """
 +
 +class GametrailersIE(MTVServicesInfoExtractor):
-     _VALID_URL = r'http://www.gametrailers.com/(?P<type>videos|reviews|full-episodes)/(?P<id>.*?)/(?P<title>.*)'
- 
+     _VALID_URL = r'http://www\.gametrailers\.com/(?P<type>videos|reviews|full-episodes)/(?P<id>.*?)/(?P<title>.*)'
      _TEST = {
          u'url': u'http://www.gametrailers.com/videos/zbvr8i/mirror-s-edge-2-e3-2013--debut-trailer',
          u'file': u'70e9a5d7-cf25-4a10-9104-6f3e7342ae0d.mp4',

diff --cc youtube_dl/extractor/viddler.py
Simple merge