A demo of a syntax highlighting IDE configuration tool
Updated CMakeLists.txt
Merge remote-tracking branch 'upstream/master' into ide_demo
Updated how config files are loaded
Fixed bug in code for stopping long-running simulations
allow grids to be constructed using the Eclipse DVX, DVY, and DVZ keywords

for this purpose, a new function called 'ecl_grid_alloc_dxv_dyv_dzv'
is introduced. Also, the semantics of the 'offset' argument of the
ecl_cell_init_regular() function needed to be changed: Now it
represents the offset of the cell in question instead that of the
grid...
add simplistic unit test for ecl_alloc_grid_dxv_dyv_dzv()

so far, it just tests that the the cell volumes are correct.
Merge pull request #231 from andlaus/load_dxyzv_grids

allow grids to be constructed using the Eclipse DVX, DVY, and DVZ keywords
Merge branch 'ide_demo' into ide_configuration

Conflicts:
	devel/python/python/ert_gui/pages/plot_panel.py
Changed state_map_deselect behaviour - will not grow mask
Added Statoil:Python labels to test
fix creation of the COORD keyword

basically, the loop went one index too little...
Added test for stop simulation bugfix
Added StatoilData property to additional test
Merge pull request #235 from andlaus/fix_coord_kw

fix creation of the COORD keyword
Merge pull request #233 from chflo/stop_simulations_bugfix

Fixed bug in code for stopping long-running simulations
Added missing include, trigging gcc warning.
Merge branch 'master' into missing_include
Merge pull request #236 from perroe/missing_include

Missing include
Reorder lines so declaration comes first to prevent compiler error on Windows.