Removed Armadillo patch to suppress hdf5 header. Now unnecessary due to fix via CMake variable.