Add in several self-diffusion for water.

Also move the macros defining which set of isotherm data to use
to the diffusivity header.