Fix cut&paste typo
Add in benchmarking code
Cleaning up config files
Normalize/DRY benchmarking code
Merge from bench
Take out marc source files