Merge remote-tracking branch 'upstream/master' into run_ensemble_experiment
Merge remote-tracking branch 'origin/python2.7' into run_ensemble_experiment
Reimplementation of import testing. It is now automatic!
Merge remote-tracking branch 'upstream/master' into import_tests

Conflicts:
	devel/python/test/ert_tests/test_ert_import.py
Missing CMakeLists
Added a dependency to Ecl
Merge pull request #218 from jepebe/import_tests

Import tests