Fix type uri template generation.
Merge branch 'development' of https://github.com/okb/Pomona into development