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 remote-tracking branch 'upstream/master'