Merge some changes back from master as the two repos had
diverged a bit.  Tested graph, MPI and graph_parallel on
Darwin and Linux, no problems.