Fix for GNU sed
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
Add sample hiera configuration
Add note about the module cache
Don't let .DS_Store files break script/bootstrap

Fixes boxen/our-boxen#512

In particular, I have seen problems with the following hidden files that Mac creates:
- `.DS_Store`
- `.!59508!.DS_Store`
- `.!59554!.DS_Store`
Merge pull request #555 from idris/patch-1

Don't let .DS_Store files break script/bootstrap
Mention the default hiera configuration in README
Suggest some example hierarchies
Be explicit that puppet-module-data is important
Merge pull request #552 from boxen/hiera-and-module-data

Hiera and module data
Fix typo for ripienaar/puppet-module-data module
Fix for when is GNU sed installed in homebrew with --default-names
Merge pull request #557 from stepanstipl/fix-puppet_module_data

Fix "Unable to find module 'ripienaa/puppet-module-data' on https://github.com"
Merge pull request #558 from stepanstipl/fix-gnu_sed

Fix for when is GNU sed installed in homebrew with --default-names
Update to puppet-nodejs 3.7.0
Merge pull request #559 from skottler/nodejs_370

Update to puppet-nodejs 3.7.0
Add deep_merge to the Gemfile(.lock) and vendor it
Merge pull request #561 from skottler/bugs/560

Add deep_merge to the Gemfile(.lock) and vendor it
Upgrade boxen version to 2.5.0

Closes #554