fix dependency on matcher
updated uritemplate-test to latest
Move implementation into mini-libraries
test cleanup
Merge pull request #15 from kevmoo/master

fix dependency on matcher