renaming gatling.conf so new keystores wont break existing jenkins runs
Merge branch 'master' of github.com:puppetlabs/gatling-puppet-load-test into parameterized_jobs

Everthing should be working now