Port benchmarks to new API
Merge branch 'fix-benchmarks' into loosen-deps
Fix travis file