Merge pull request #471 from indirect/master

ensure bootstrap uses system ruby
Short term hack to unbreak boxen-git-credential on 10.8 systems
Merge pull request #475 from seanknox/master

Unbreak boxen-git-credential on 10.8 systems
Clarify where to create the new git repo.

Be more explicit about where the new repo should be located. It's much
easier to set up a repo on the internet. This was implied before and now
it's explicit.

The first time I helped a colleague set this up, we used a local repo.
Since we didn't know what we were doing, we screwed it up pretty badly.
This bit of text might allow others not to make the same mistake we did.
Clarify the installation steps after bootstrapping

Make it clearer on how to install a boxen from the command line after the
bootstrapping steps are done.
Merge pull request #477 from mattr-/explain-repo-location

Clarify where to create the new git repo.
Merge pull request #478 from mattr-/clarify-install

Clarify the installation steps after bootstrapping
remove unused variable
Merge pull request #481 from grosser/grosser/fetch

remove unused variable
add xcode instructions for mavericks
Update script/bootstrap sudo to pass environment variables.

When executing a boxen run from inside the corporate firewall we need to pass
proxies through to sudo so that bundler will be installed properly as root.
Merge pull request #489 from johnbellone/patch-2

Update script/bootstrap sudo to pass environment variables.
update XCode instructions re: boxen-web
Merge pull request #485 from afeld/patch-1

Add XCode instructions for Mavericks
OSX -> OS X
Update README.md

I found a superfluous space, and also because you are _in_ the directories you need to `./script/boxen` each time.
Merge pull request #490 from jjasghar/patch-1

Update README.md
Bump dnsmasq to v1.0.1
Update Puppetfile.lock

$  bundle exec librarian-puppet install
This also removed the older cache version, so replacing it with the new
tar.gz file
Merge pull request #496 from viddo/bump-dnsmasq-to-v1.0.1

Bump dnsmasq to v1.0.1