cleaning up templates
Merge pull request #24 from afortune906/master

cleaning up templates