Clean up build process; use command-line make var settings to remove need for
patch files.
Get working w/pgi compilers.
Merge branch 'master' of https://forge.sdsc.edu/stash/scm/aps/cpmd-roll