Update puppet-git for security release of git

See https://github.com/blog/1938-vulnerability-announced-update-your-git-clients
Merge branch 'master' of https://github.com/boxen/our-boxen

Conflicts:
  Puppetfile.lock