Accidentally failed to merge a conflict.
Was not applying type traits to a HDF5 write method.
Various fixes as a result of including libhpc.hh in
another project.