Include hash directly in CATools.h
Portability fixes for AWS deployment.
Disable an old test of the stochastic reservoir that doesn't really test anything.
Merge branch 'portability'