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

Task cleanup
get rid of OS junk files
Merge pull request #49 from LukeAskew/no-junk

Get rid of OS junk files
Update README.md
Update README.md