Updated benchmarks to follow the benchmark-tools protocol
Make Surveytool use 'benchmark-paper' directory and make it possible to disable individual benchmarks