Keep calling the fair_scheduler until it gives us the next task.
Increase some of the timeouts to avoid master crashes.

Conflicts:
	master/src/fair_scheduler_job.erl