Added functions for density and kinematic viscosity.
Revised water (for #21).
Changed computation of s

This is for #21, to allow the volume to also be used with Annex60.Media.Water.