Moved handling of timed out workers within the Master actor

Conflicts:
	core/src/main/scala/spark/deploy/DeployMessage.scala
	core/src/main/scala/spark/deploy/master/Master.scala