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
Added boxen upgrade instructions
Merge pull request #577 from seanknox/fix-xcode51-ruby

Fix to support LLVM/ruby that ships with Xcode 5.1
update Puppetfile homebrew version
Merge pull request #590 from jakecraige/master

update Puppetfile homebrew version
Added more detailed update process
Moved Upgrading instructions to FAQ
fixed spelling error
Update README.md

Other boxem fixed.
Merge pull request #587 from nbmorgan/master

Added boxen upgrade instructions
Upgrade puppet-git to 2.3.1

Closes #598
Suppressing error message when CLTools not installed

On Mavericks you can install full Xcode and Boxen, but then you get this line every time you run `boxen` on the command-line:

    No receipt for 'com.apple.pkg.CLTools_Executables' found at '/'.

This minor bugfix suppresses the message.
update Ruby and Puppet Deps