Solar + Batteries Vs. Generators: Batteries are Increasingly Competitive