Merge pull request #58 from joakim-hove/master

Misc updates to master
Merge branch 'master' of github.com:Ensembles/ert