COMP: Clean up & fix compiler warnings
COMP: Clean up & fix compiler warnings

From: George Zagaris <george.zagaris@kitware.com>

git-svn-id: https://svn.alcf.anl.gov/repos/DarkUniverse/hacc/trunk/cosmotools@2003 952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf
Merge branch 'svn/trunk'