Fixes for make-workload script so that we can handle existing trace files that are split
Merge branch 'anticache' of github.com:apavlo/h-store into anticache