switch wiki links to template tags
Merge pull request #893 from drwelby/wikilinks

switch wiki links to template tags