Disaggregating electricity generation technologies in CGE models: A revised technology bundle approach with an application to the U.S. Clean Power Plan. (15th September 2015)