Merge pull request #1 from losalamos/master

Sync
Fix build.

Is the gcc-specific OpenMP code needed? Just use the Intel stuff. Note that this
is just a hack that should be cleaned up.
Fix OpenMP numthreads code.
Merge pull request #3 from samuelkgutierrez/master

Minor Fixes