Changed cpWatLiq for consistency with Water.mo. Removed phi in base properties.
Preliminary revision of water model.
Revised specificInternalEnergy and did other revisions.

This is for #21.