Update to work with changes for NVDIMMSim's sandia branch.
Minor update to make Clang's scan-build happier.
Merge branch 'dev' of github.com:jimstevens2001/HybridSim into sandia