Fixes "ComputerName: not set" issue #2155

As already mentioned in #2155 `ComputerName` has to be set before, otherwise you get `ComputerName: not set` on startup. I think `hostname -s` is more common/global way to get short host name.

Tested on OS X 10.8.5 and Ubuntu 12.10