Aggregation of Electric Water Heaters for Peak Shifting and Frequency Response Services