Changed log class to use (optionally) syslog.
Fixed merge conflict