Merge pull request #2 from copleykj/master

check for collection in cfsFileInput helper
updates for revised handling of "master"
Merge origin/master
new template engine wants spaces between attributes and stache tags