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
Merge branch 'master' of github.com:boxen/our-boxen

Conflicts:
	Puppetfile.lock