updated with upstream
clean run
Updating upstream branches.
Merge branch 'master' of https://github.com/boxen/our-boxen
updating
merging
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
merging upstream changes
Merge remote-tracking branch 'upstream/master'
added elastic search
updated