Improved Prediction of Water Properties and Phase Equilibria with a Modified Cubic Plus Association Equation of State