Updating templates

- rename project to tenant
- add and removew whitespace here and there
Merge pull request #2 from hanney/context_templates

Updating templates