Merge pull request #53 from laods/rocktype

Look for keyword 'ROCKTYPE' if 'SATNUM' is not found
Disable build kluge that is no longer pertinent

The <have_boost_redef.hpp> header was introduced (commit
OPM/opm-core@82369f9) as a work-around for a particular interaction
in the Autotools-based setup of OPM-Core and the Dune core modules.
Notably, Dune's "Enable" trick for Boost failed on some older
Autoconf systems.  Now that we're using CMake, however, that kluge
is no longer needed because OPM-Core always

  #define HAVE_BOOST 1

i.e., as an explict true/false value.

Therefore, we need no longer include <have_boost_redef.hpp> .  The
header will be removed at a later time.
Merge pull request #55 from bska/remove-redef-kluge

Disable build kluge that is no longer pertinent
Merge remote branch 'remotes/upstream/master' into average_fracflow_inlet
Don't extrapolate relative permeability

Extrapolation of relative permeability may cause rel.perm. values
out of range ([0,1]) since rel.perm. functions are monotone.

This commit set rel.perm. equal to 0 or 1 if returned value
falls outside this range.
Merge branch 'no_extrapol' into average_fracflow_inlet
Print BC info when calling setupUpscalingConditions()

Also some untabifying
Fix error in printing of fixed BCs