fixed metric updating
Merge branch 'master' of https://github.com/edwardwsears/18740-Research

Conflicts:
	sim/Simulator/CmpCache.h
	sim/Simulator/bin/Debug.OoOTraceSimulator
	sim/Simulator/bin/OoOTraceSimulator
	sim/Simulator/bin/Prof.OoOTraceSimulator