Fix URI
Fix the rest of the URI stuff
Merge branch 'master' of github.com:miekg/dns