Bottled water sales are running out of steam, and we are falling back in love with our taps. But which is better for you? Elizabeth Royte investigates