Adding WaterML2 parser back in.