Gatling v200

Merges in from Mark's gatling2conversion as well as my own changes