Removed a warning.
Minor cosmetics to remove warnings.
Finished FileSurveyor plug-in and test for it, and two more missing attributes in the MPI instrumentation.
Last touch on FileSurveyor - enable MPI layer, too.