Fix bug in saturation initialisation.

We shall only use gas-water capillary to initialise when we would get
unphysical saturations otherwise.
Add test case with overlapping transitions.

Capillary pressure functions and contact depths
have been modified to ensure a large overlap.