mod elec and water
Merge branch 'master' of https://github.com/atomicfaster/worldResidentAPS

erges an updated upstream into a topic branch.