including the merge of `hdffv/hdf5/develop`, back to the branch that Vailin and I share. Now I need to put this branch on a fork with a less confusing name than vchoi_fork!
the output in the makefile was pretty hard). Tested that make still works on kagiso; no code changes at all.