Fix up CMake system
Got MPI/HDF5 working with CMake