Wooho something!
Merge branch 'cost_model_preemption' of https://github.com/gustafa/firmament into cost_model_preemption

Conflicts:
	sim/webloadgenerator.py