waterheater objects incorrectly use demand instead of water_demand in Feeder_Generator.m

[blthayer]

See lines 2012-2041

[blthayer]

@afisher1 or @Jacobhansens - if you give me push permissions I have the fix done on my local branch.