Remove MPICH 1.
Abort roll build if package build fails.
Clean-up.
Clean up.
Less fragile way of allowing selection of MPI flavors to build using the
ROLLMPI make variable.