This should make it work more or less correctly with finite water.
also, fix a bug where a blocked spigot still looks like its pouring, and check
for blockages on every step.
It was just a minor logic error resulting from moving the water flowing code
into it's own file when I originally imported it. Many thanks to Mauvebic for
writing it!