Cleanup queries for chart 111.

The peak demand shown in this chart is now determined from the ETEngine demand_curve method. In addition, I renamed queries and cleaned them up.