Add more time limits to tasks
Merge pull request #42 from praekelt/develop

Add more time limits to tasks