Info above is good.
A little good info here:
http://www.fema.gov/plan/prepare/water.shtm
They mention adding a little regular bleach if you are using well water.
And a little more detail on using bleach and storing water here:
http://www.lds.org/family/family-wel...lines?lang=eng