Added support for template generation

- Generate a list of templates based on modifiers
- Simplified comment finding regex
- Added template generation tests
Merge branch 'master' of https://github.com/randak/watercress