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
updated boxen-git to 2.3.0
Merge pull request #569 from tarebyte/master

Update Puppetfile boxen-git to 2.3.0
bump version on modules (includes ruby heartbleed fix)
Merge pull request #572 from mroth/heartbleed

bump version on modules (includes ruby heartbleed fix)
Fix to support LLVM/ruby that ships with Xcode 5.1
Merge pull request #577 from seanknox/fix-xcode51-ruby

Fix to support LLVM/ruby that ships with Xcode 5.1
merging
merging