Add tox://, dns discovery
Merge remote-tracking branch 'upstream/master'
Added Tox ID information