Rename mpich to mpich2
Update for OSX