Conflict map improvement

ConflictMap now maps assignments to assignment/penalty# pairs, and we
rank the assignments based upon the total penalty that assignment
contributes