Changes to get make all working again. With these fixes we can compile up some libfemtools, including fldecomp
Merge branch 'fluidity-core/MultiFluids_Dev' of github.com:jrper/MultiFluidFluidity into fluidity-core/MultiFluids_Dev