fix zero mode on mac
git: add netrc support to update-github-org
ohai: simplify hostname/fqdn detection
update to ruby-2.1.2
ohai: fix hostname detection
Merge branch 'upstream'