Efficiency in a New World - Electricity Markets with Renewables and Storage