Fix invalid HTML in templates.

HTMLBars (coming soon in Ember 1.10) validatest templates during
compilation. This PR fixes errors identified.
Merge pull request #4727 from rwjblue/fix-template-html

Fix invalid HTML in templates.