Reapply MSW to upstream/master

This PR should be held until the PR: https://github.com/Ensembles/ert/pull/120 has been merged.