Econ2011 changed to Calvin2011.
Changed Econ2011 to Calvin2011 everywhere in our code.
Econ2011 (Calvin2011) and Warr2000 are gone.
We are how using an AllHistData object that has both.