Expand explanation of MPICH2 build and use
Merge branch 'slurm-2.5'