Merge pull request #180 from instantsoup/master

water usage plotting fixes