Fix `hostname --fqdn` stupidity on linux
Merge pull request #296 from jaymzh/hostnamefix_6

Fix `hostname --fqdn` stupidity on linux -- ohai6