Update to template to direct to metadata page
YAML spacing
Merge branch 'master' into gh-pages

Resyncinng from github