Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of ssh://github.com/dr-robertk/opm-parser
Added keywords SOF2 and SWFN to allow for different saturation functions.
added keywords FULLIMP and IMPES.
Merge pull request #376 from dr-robertk/PR/add-keyword-FULLIMP-IMPES

added keywords FULLIMP and IMPES.
Merge pull request #375 from dr-robertk/PR/add-keyword-SOF2-SWFN

Added keywords SOF2 and SWFN to allow for different saturation functions.
Added if (BUILD_TESTING) ... around tests.
Changed backtics to single ticks in string literal.
Removed unused Deck argument in method
Merge pull request #377 from joakim-hove/BUILD_TESTING

Build testing
remove all trailing white space

this is just the result of

```
find -iname "*.[ch]pp" | xargs sed -i "s/ *$//"
find opm/parser/share/keywords -type f |  xargs sed -i "s/ *$//"
```

so if it causes conflicts with other patches, the others should get
priority. The rationale behind this patch is that some people tell
their editor to remove white space which leads to larger than
necessary patches...
GridPropertyInitializers: fix signedness comparison warning
clang 3.3: fix "unknown escape sequence" warnings
Merge pull request #379 from andlaus/fix_warnings

Fix warnings
Merge pull request #378 from andlaus/remove_trailing_whitespace

remove all trailing white space
Removed m_deckIndex property from DeckKeyword
DeckKeyword is immutable.
Merge pull request #381 from joakim-hove/KeywordContainer-const

Keyword container const
Make MULTREGT work for NNC.

The region multipliers are no longer added  to the cartesian logical
MULT[XYZ] structure. Instead a new method
getRegionMultiplier(globalIndex1, globalIndex2,FaceDir) is added that
return the multiplier between globalIndex1 cell and globalIndex2 cell.
The face direction is added to support directional dependent MULTREGT
input. This implementation of MULTREGT also supports restricting the
multipliers to only apply for NNC or NONNNC.
address the review comment of #373