2.5dev - updated for the newest code in master

I modified the build process a bit with this one as well for faster PLFS and OpenMPI builds.  If anyone objects to them I'll pull them out.