Changed some config values and added more comments
Changed machineName function, as $HOSTNAME is normally not an environment variable. We now use "hostname -f" to get the desired information.

Signed-off-by: Christian Rapp <crappbytes@gmail.com>