hdf5

Miscellaneous cleanup
Description:
    Moved items around to remove Doxygen warnings.
Platforms tested:
    Linux/32 2.6 (jam)
    Linux/64 (platypus)
    Darwin (osx1010test)