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
Merge branch 'master' of git://github.com/boxen/our-boxen

Conflicts:
	Puppetfile.lock