Beginning the process of including a CES model without energy. Can now call the cesModel function without an energyType term and get a model back.