First go at refactoring logging stuff
Merge branch 'feature/log-reconfigure' into develop

This fixes some logging issues (I hope)