Adapt to moved opm-core headers.
Adapt to changed opm-core header name.
Renames classes in line with opm-core changes.
Merge remote-tracking branch 'upstream/release/2013.03' into combined
Update to match opm-core changes.
Merge pull request #17 from atgeirr/combined

Adapt to changes in OPM/opm-core#203