Clean up task names, fix file lookup
Merge pull request #4 from rspieldenner/master

Clean up task names, fix file lookup