Really Tricky Logic Puzzle

A little while ago, I was supposed to go to bed, but before I did, I thought I would check out digg to see if there were any interesting stories to read. The top story was a link to Einstein's Riddle: a logic puzzle he wrote in the early 19th century. What caught my attention was a line that stated that Einstein said that only 2% of the world's population would be able to solve it. I wanted to see if I was part of that percentage. So after creating a rather crude hand-drawn chart and a more intelligible chart created with OmniGraffle, and a little less than an hour later, I was able to confirm that I was indeed part of the 2%. The logic puzzle isn't as difficult as it first appears, but it definitely made me use every last working brain cell to get the solution. Once I reached the part where I found out who drinks water, it all sort of snowballed from there. If you have some spare time, see if you can beat my time. I will just round my time up to one hour to make it simple. Don't cheat and look at the answer; really see if you have what it takes to solve the puzzle. After you are done solving it or after you give up, you can look at my two charts that I made that helped me organize my thoughts. Hand Drawn Chart Computer Flow Chart