First attempt at fixing build errors for Cray MPICH2
Merge pull request #290 from thewacokid/master

First attempt at fixing build errors for Cray MPICH2