New electric generating capacity in 2020 will come primarily from wind and solar