refs #7207 - update deploy to fix el7 and other issues

update to latest puppet to avoid 3.6 to 3.7 mid-install update problem
do not use --reset as the server is not configured yet
when doing bats, just run the bootstrap, don't run setup.rb
Merge pull request #72 from jlsherrill/el7

refs #7207 - update deploy to fix el7 and other issues