Singularize names in 'New' links in bake templates
Merge pull request #4041 from bcrowe/3.0-bake-template

3.0 - Singularize names in 'New' links in bake templates