Add in Context IDs to the simulator. From now on, cpuId is almost never used,

Add in Context IDs to the simulator.  From now on, cpuId is almost never used,
the primary identifier for a hardware context should be contextId().  The
concept of threads within a CPU remains, in the form of threadId() because
sometimes you need to know which context within a cpu to manipulate.