Tidy up the templates cookbook.
Change template example to use licence
Merge branch 'master' into tidy-templates-cookbook
Merge pull request #486 from richardmiller/tidy-templates-cookbook

Tidy up the templates cookbook.