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
add core.excludesfiles to configs deleted.
Change acronym to the nicer What.
Remove commit from other virtual branch. Revert "add core.excludesfiles to configs deleted."
This reverts commit 0637cb7608fbb8e5776c624f5d39203599cadcd2.
Merge pull request #511 from AnneTheAgile/494-fix-doc

494 fix doc to be friendly for this lady to read
Merge branch 'master' of https://github.com/boxen/our-boxen

Conflicts:
	Puppetfile
	Puppetfile.lock