Commit for saving.
Merge remote-tracking branch 'upstream/master' into New_BLACKOIL_SIMULATOR
Finishing changing. Testing Later
Finishing compliation.
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).
Merge branch 'master' into restructure-sim

Conflicts:
	opm/autodiff/SimulatorFullyImplicitBlackoil_impl.hpp
Merge pull request #179 from atgeirr/restructure-sim

Restructure fully implicit blackoil simulators