Remove water from inventory, place glass

Fixes #55
Fixes #19"