Merge remote-tracking branch 'brson/sched-cleanup'

Conflicts:
	src/libcore/rt/sched/mod.rs