fixing git credential helper for GitHub Enterprise
Update faq.md
updating github enterprise support for 2fa
Update a bunch of modules
Update a bunch of gems
Merge pull request #372 from fschwiet/patch-1

Update faq.md based on question
Merge pull request #361 from mdelagralfo/git-credential-fix

fixing git credential helper for GitHub Enterprise
Update some modules
Merge pull request #426 from boxen/mavericks-updates

Mavericks-related updates
force UTF-8 encoding
Merge pull request #448 from indirect/cred_helper_encoding

force UTF-8 encoding in credential helper
Remove node v0.4 because it fails on 10.9
Merge pull request #455 from boxen/remove-node-0.4

Remove node v0.4 because it fails on 10.9
Node.js v0.4 no longer provided by default

as of 2fc3983825
Merge pull request #457 from celkins/patch-1

Node.js v0.4 no longer provided by default
Add Node 0.10
Merge pull request #460 from pedrogimenez/update-readme

Add Node 0.10
set shebang in gem bins to system ruby
Merge pull request #471 from indirect/master

ensure bootstrap uses system ruby
Merge branch 'master' of git://github.com/boxen/our-boxen

Conflicts:
	Puppetfile.lock
	manifests/site.pp