added some missing templating constructs to grammar
fixed description of <?link>
removed unused non-working <?link> construct description
Merge pull request #58 from occamlabs/templating-fixes

Templating fixes