Merge branch 'master' into gui
Ensemblefetcher fixed, and three more classes added.
Merge branch 'master' into gui
ensemblefetcher.py and plotdata.py ripped of ert.prototype
No more ert.prototype. All functions are now wrapped in their respective classes
Forgot one file
Merge branch 'master' into gui
Adding nbproj and build folder to gitignore
More modifications to the gui. Mainly removing defunct function calls
Merge branch 'master' into gui
Some more defuct functions removed. Some changes to enkf_test.py
Merge branch 'gui' of github.com:Ensembles/ert into gui
Added safe prototype functionality
Merge branch 'version-1.1' into gui

Conflicts:
	devel/python/python/ert/ecl/CMakeLists.txt
Fixed two of the tests in enkf_test.py
Merge remote branch 'inge/gui' into gui
Unit test for enkf_test now runs smoothly
Changed defunct functions to safe_prototype
Added functions to analysis config
Moved the ert_gui hierarchy besides the normal ert/ hierarchy