Revert "Revert "Merge branch 'master' of github.com:Ensembles/ert""

This reverts commit 0a59f3e03d49d1107874c500a76bba6393541b1d.