Tweaked uritemplate.js to allow '-' character in identifiers which is technically illegal according to the RFC. Might need to revisit this later.

The only kind of key allowed so far is of the form 'host-clientid' where client id is a node in the rspec.