Fix compile issues
Merge branch 'master' of github.com:ComputationalRadiationPhysics/libSplash