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
Add Ruby 2.0.0 to README

It's provided now.
Merge pull request #433 from jjbohn/patch-1

Add Ruby 2.0.0 to README
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
Update with upstream b6d0b4175f

Merge remote-tracking branch 'upstream/master' into merge-upstream-08112013

Conflicts:
	Puppetfile
	Puppetfile.lock
Merge pull request #38 from alphagov/merge-upstream-08112013

Merge upstream as of b6d0b41