Fix merge conflicts
Merge branch 'csv-reporter' of github.com:jmyounker/vegeta into csv-reporter