Waters quench more. Closes #447

"Water" quenches 40, equal to tea and coffee
"Clean Water" quenches 50, best thirst quencher.