Merge to master.

Following my update of property_map to master, I now need to merge a few graph_parallel changes to master.  Tested on Darwin with MPI, all tests passed.  I'll shortly commit the changes and close this PR.