Cleaned up task and modified the default template
Merge pull request #6 from darcyclarke/develop

Cleaned up task and modified the default template