Added boxen upgrade instructions
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
Merge pull request #613 from boxen/update-deps-06-03-2014

Update Ruby and Puppet Deps
Merge pull request #607 from walling/master

Suppressing error message when CLTools not installed
Revert "Merge pull request #607 from walling/master"

This reverts commit 1aea2e02c1a8d641bc7f7c6e58d7faaf13cb1696, reversing
changes made to db3d1de5f8ab587fcbad6813edfb7ce52d21ad96.
update puppet-ruby
Merge pull request #615 from boxen/update-ruby

Update puppet-ruby
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  update puppet-ruby
  Revert "Merge pull request #607 from walling/master"
  update Ruby and Puppet Deps
  Suppressing error message when CLTools not installed
  Upgrade puppet-git to 2.3.1
  Update README.md
  fixed spelling error
  Moved Upgrading instructions to FAQ
  Added more detailed update process
  update Puppetfile homebrew version
  Added boxen upgrade instructions

Conflicts:
	Puppetfile
	Puppetfile.lock
	README.md
	manifests/site.pp