Handle `hostname --fqdn` stupidity
Merge pull request #294 from jaymzh/hostnamefix_7

Handle `hostname --fqdn` stupidity