I wouldn't do the bottled water thing or the brita, and I don't know about boiling (does someone else?) but I've heard that if you put regular tap water in a pitcher or glass and let it set for 10 minutes or longer, the chlorine is supposed to evapourate or settle. You might try this.