From http://www.foodinsurance.com
I somewhat disagree with number 4 and 5. Water doesn't go bad unless it is contaminated. If it is in a clear container you will be able to see things growing in it that may be otherwise concealed by a container. Keep plastic containers out of the sun, but heat and humidity aren't really a problem with water storage. Other than that, this is pretty good.