Replace dashes by underscores in GitHub usernames
Add note about GitHub usernames with dashes in README
Merge pull request #310 from benja-M-1/master

Replace dashes by underscores when generating personal manifest
Set the global node version in the site manifest
Merge pull request #311 from smcnabb/master

Set the global node version in the site manifest
Revert "Merge pull request #311 from smcnabb/master"

This reverts commit 40de1e40f3e3c5d47d157c1f996a2a21f033a113, reversing
changes made to 206dee9965730738b0c6011e271950ebfa329d75.

Reason: This make harder to override the global version if it is
required for someone.

See https://github.com/boxen/our-boxen/pull/311#issuecomment-19719152
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Revert "Merge pull request #311 from smcnabb/master"
  Set the global node version in the site manifest
  Add note about GitHub usernames with dashes in README
  Replace dashes by underscores in GitHub usernames