Fixed bogus Mac hosts.
Merge branch 'master' into home
Fix mac hosts.