Added support for unwrapping templates (a template that refers to one or more other templates by name).
Cleaned up code slightly.
Cleaned up code a little further.
Merge pull request #255 from gaurav/feature/unwrapped-self-template

Feature/unwrapped self template