clean up collate task
clean up template task
convert back to tabs. oops.
Merge pull request #47 from LukeAskew/task-cleanup

Task cleanup