Follow changes to opm-core.
Merge pull request #35 from atgeirr/combined

Adapt to changes in OPM/opm-core#203