Merge pull request #323 from thewacokid/master

Reverted to older build process (for runpath/rpath reasons) for MPI