update gemfile.lock
update puppetfile
Merge remote-tracking branch 'template/updates'