2d ground water flow

Some updates. Integration tests broken, but 2d GW running :)