Minor cleanup.
Further simplify getOrElse call.
Merge remote-tracking branch 'stephenh/cleanup'

Conflicts:
	core/src/main/scala/spark/scheduler/local/LocalScheduler.scala