Commit for saving.
Merge remote-tracking branch 'upstream/master' into New_BLACKOIL_SIMULATOR
Finishing changing. Testing Later
Finishing compliation.
Re-introduced tempoary fix for singular matrix.
Support for kw VAPPARS.

When this kw is active, BlackoilPropsAdFromDeck now modifies rvSat
and rsSat curves cell-wise by a power of (sat_oil_cell /
sat_oil_cell_historical_max).   Currently, the associated jacobians do
not reflect terms of type d/d_sat_oil, but code for doing this is given
as comments to BlackoilPropsAdFromDeck::applyVap(ADB& r, ...).
Revert "Re-introduced tempoary fix for singular matrix."

Seems not to be needed any more ...
This reverts commit bb12bdd1fd8cdca7d39b7aa513a4a612b76451f8.
Merge remote-tracking branch 'GitPaean/New_BLACKOIL_SIMULATOR' into restructure-sim

Conflicts:
	examples/sim_fibo_ad.cpp
	opm/autodiff/SimulatorFullyImplicitBlackoil_impl.hpp
Remove unused pore volume calculations.
Clean up files and streams for timing output.

Total time will be written to walltime.txt, and single step times to
step_timing.txt (changed suffix from param to txt). This did not work
properly before this fix (step_timing file was overwritten each step).
Fix template argument of solver class.
Remove superfluous output and use const.
Use generic WellsManager constructor.

Also fix minor whitespace issues.
Update sim_fibo_ad_cp to use refactored simulator class.

Also add some other features that have been added to sim_fibo_ad
but not to sim_fibo_ad_cp:
 - (Un)Strict parsing parameter.
 - EQUIL init (currently throws, since initEquil not yet made generic).
Bugfix, correcting incomplete merge.
Guard against "too small" max saturation.

This parameter might well be user configurable ...
Fixing some syntax.
Update of hysteresis model is now performed prior

to each time step, thus also capturing the initial state.
Merge pull request #163 from osae/vappars

kw VAPPARS etc
Merge branch 'master' into restructure-sim

Conflicts:
	opm/autodiff/SimulatorFullyImplicitBlackoil_impl.hpp