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
Method ecl_util_get_num_cpu(..): Added support for keyword SLAVES
Method ecl_util_get_num_cpu(..): Added support for keyword SLAVES
Made functions static
Merge pull request #217 from chflo/slaves_keyword

Method ecl_util_get_num_cpu(..): Added support for keyword SLAVES
Missing CMakeLists
Merge remote-tracking branch 'upstream/master' into plotting
Added a dependency to Ecl
Fix failure if there are spaces in the source path.
Merge pull request #219 from perroe/path_space_fix

Fix failure if there are spaces in the source path.
Made OpenMP support off by default
Moved OpenMP configuration to libecl
Added explicit ecl dependency in librms
Removed explicit loading of libgomp from libecl - trusting RPATH to work
Merge pull request #220 from joakim-hove/openmp-flags

Openmp flags
Merge remote-tracking branch 'upstream/master' into import_tests
Merge pull request #218 from jepebe/import_tests

Import tests