Changed uri/url plugins to use RFC3986
Merge branch 'master' of github.com:abw/Template2