Refactored the benchmark in preparation for incorporating concurrency. Many small fixes.
Merge branch 'master' of https://github.com/goatdb/llama