Updates for benchmark generalization
Merge branch 'feature/benchmark-updates' into develop
s/bashobench_suite/benchmark_suite/
Update inventory for riak cs 1.4.2