Update marionette.compositeview.md
Add missing 's' on index links
Merge pull request #1711 from jfairbank/functions-docs

Add missing 's' on index links
Merge pull request #1699 from Pleochism/patch-1

Update marionette.compositeview.md
Clarify templateHelpers docs for non-helper methods.
Merge pull request #1717 from cmaher/template-helpers-docs

Clarify templateHelpers docs for non-helper methods.