Make cleanup timeout a task specific property

Fixes #19 
Can you fix the double `..`