Merge remote-tracking branch 'upstream/master' into ert-test-run
Added missing calls to test_work_area_set_store()
Updated store argument to TestAreaContext
Updated test to exclude random part of name
Added missing CMakeLists.txt file
Revert "Merge pull request #205 from flikka/master"

This reverts commit e535fbbc7212796a4e2662e1afcc7320646d93b9, reversing
changes made to 3a9a1f687f86aec49773e7fcccd82f7fc51a46bb.
Merge remote-tracking branch 'joakim/ert-test-run' into fix-run-ert
Merge pull request #208 from flikka/fix-run-ert

Re-introducing the reverted merge from joakim-hove/ert-test-run, with additional fixes from that branch