Merged python-ctest updates
Merged master
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
Merge branch 'master' into forward-init
Removed two ~files which were incorrectly added. Fixed an unresolved merge. ERT-91
Merge pull request #80 from joakim-hove/lgr-troll-bug

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

Forward init - attempt 2
Merge branch 'master' of github.com:Ensembles/ert into gui