adding water
Merge remote-tracking branch 'origin/twig' into ice-water

Closes #3 to consolidate the water recipes.