Updates.  Added grants section
ModSim position paper.
Updates to conflicts.