Merge pull request #32 from myrle-krantz/develop

straightening up task definitions in preparation for attacking task instances.