Fix another typo
Assign self.simulation
Merge branch 'master' of github.com:ucb-sts/sts

Conflicts:
	sts/control_flow/mcs_finder.py