CRA-534: Fixed some warnings related to merging with nrlib.
Merge pull request #55 from gudmund-hermansen/master

CRA-534: Fixed some warnings related to merging with nrlib.