Feature/syslog logging again

Including the rollback commits from master so we can easily merge this into master later.