finished replacing words in template with tags
Merge branch 'master' of https://github.com/blackchair/parley