Parameterize bin/perf. Environment variables can now override json settings
Adding extra highload jobs for PE33
librarian-puppet has new version 1.1.0 and it no worky
Add support for PE34
Add ERG tests and code to do the Right Thing if we are runnning an ERG test
Merge pull request #89 from doug-rosser/parameterized_jobs

Parameterized jobs
Move build.properties to correct location, make cat-zero sim work with puppet-agent certs
Merge pull request #90 from cprice404/maint/master/make-cat-zero-sim-compat-with-puppet-agent-certs

Move build.properties to correct location, make cat-zero sim work with p...
Modify the perf script to use a separate hardware node as the gatling driver if an agent node is in the configuration file
Merge pull request #91 from doug-rosser/two_node_config

Talked through this with Doug.  Looks good.