Smarter URI Matching

Closes #18