Patch Fix

Was having trouble getting install to not throw errors, so manually
applied relevant ones from Rob’s patch
HDF5 speedup

Applied Toni/Keith’s modifications to stop the HDF5 slowdown