There is a new water filtration device about to hit the market. It looks like a sports bottle and removes 99.9999% all virus's and bacteria as well as chlorine etc etc
You can even dip it into a murky pond and the water will be drinkable in 20 seconds.
The filter lasts for 1500 gallons and when it needs to be replaced you can't drinnk any more water so you won't accidentally drink dirty water
http://www.foxnews.com/story/0,2933,354735,00.html