Merge remote-tracking branch 'github/build-deps-update'

Conflicts:
	scripts/build-dependencies.sh

git-svn-id: https://svn.alcf.anl.gov/repos/DarkUniverse/rru2/branches/rru2-memfix-cosmotools/cosmotools@1301 952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf
ENH: Fake commit to test svn-to-git workflow


git-svn-id: https://svn.alcf.anl.gov/repos/DarkUniverse/rru2/branches/rru2-memfix-cosmotools/cosmotools@1302 952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf
Merge branch 'master' into svn-clone