Merged python-ctest updates
More debug ...
More debug ...
More debug ...
More debug ...
ERT-112 Bug in ert_util_count_content for the case where the the file to be read has an empty newline charachter as the last element is now fixed.
More debug ...
Added config_argc() test + added quoting around input arg to job_workflow_test
Added Statoil property to well_dualp test
Merge pull request #73 from myrseth/ERT-112

ERT-112 Bug in ert_util_count_content for the case where the the file to...
Merge f-up restored
Merge branch 'master' of github.com:Ensembles/ert into gui
Added quoting of argument directory for git-commit.sh
WhiteSpace changes - to trigger build
Merged master
ERT-46: import
Removed grid_nr == GRIDHEAD[4] test from lgr loader
Merge pull request #77 from joakim-hove/lgr-troll-bug

This PR removes assumption that GRIDHEAD[4] == Running lgr number.
Merge pull request #75 from joakim-hove/forward-init

This PR will implement initialization from the forward model - Jira:ERT-91
Merge branch 'master' of github.com:Ensembles/ert into gui. And plot related changes in gui. ERT-46.

Conflicts:
	devel/libenkf/include/ert/enkf/config_keys.h
	devel/libjob_queue/tests/job_workflow_test.c