Integrating Renewables in Electricity Markets