Bulk of the Open MPI stuff sorted