Distilled water and glass bottles are the way to go. You can get a small distiller for your home relatively cheaply.
The distiller is cheap but the power is not. Its like running a microwave 24/7 to make enough water for two people. I want to try making a solar one.
Or one powered by solar panels? :)