Fix for GNU sed
Merge pull request #542 from tarebyte/master

Updating base configuration
Fix Puppetfile to match #542

It looks like #542 updated `Puppetfile.lock` but left `Puppetfile` on
the old versions.  This is resulting in issues such as #543 for people
using the clean repo.  This updates Puppetfile to match
re revert puppet-go to 1.1.0

This was fixed in #523 but undone again in #542, but should not be
moved into our-boxen until the ZSH bug is fixed.
bump git package

bugfix release
Merge pull request #545 from mroth/fix-module-update

Fix broken module update, fixes #543
Merge pull request #531 from stepanstipl/fix-gnu_sed

Fix to work with GNU sed

Conflicts:
	script/bootstrap
Revert "Merge pull request #531 from stepanstipl/fix-gnu_sed"

This reverts commit 4de4bf9a0ac5a65ffc107102e7df5e124558955f, reversing
changes made to 9adae9897db20f0770e57cf3ba3f69c56662664d.

This broke Mac OS X sed