Oh my, Grandma… what a BIG commit you have.
No fear… no comments!
missing 'it.'
Merge pull request #280 from SpiderOak/issue-174-templates

Oh my, Grandma… what a BIG commit you have.
Fixes #174
Small typo and a whitespace issue in a template
More stripped whitespace fixes
conflict resolution