URI utilities
Modify configuration and matchers to use URI utilities where appropriate
Merge pull request #76 from dmlloyd/uri

URI utilities