Merge

Merge branch 'master' of github.com:uri-templates/uri-template-py
tree: 3b1b8b31e7ec902026d49750af9002b076689188
  1. test/
  2. uritemplate/
  3. explain.cgi