Added integration by parts to calculate the capillary pressure, still testing for DG. Fixed an important bug in the caching. Small bugfixes and removal of some ifs by rewriting the calculations using intrinsic functions. Added an option in diamond to force the use of upwinding, for debuggind purposes, and also to use integration by parts in the capillary pressure term.