support the common forms used to define a term template

[elrayle]

Supports term templates in the form…

"{?term_uri}"              # term_uri is the entire template
"{?term_uri}.rdf"          # term_uri starts the template
"http://localhost/test_default/term?uri={?term_uri}"   # term_uri is a parameter of the template
"http://localhost/test_default/term/{?term_id}"        # term_id is a parameter of the template

Fixed errors:

• term_uri needs to be url encoded when it is a parameter
• term_uri should not be encoded when it is the entire template
• substitution of term id was only done when the template parameter was named term_id and not when it was named term_uri, but now happens for both