Correct some extractor _VALID_URL regexes
Merge remote-tracking branch 'dstftw/correct-valid-urls'