Make cleanup timeout a task specific property

Closes #20