fix a bug where spigot pouring would replace the node under it with
water.  Also clean up spigot logic slightly.