Clean up comments
Merge branch 'master' of https://github.com/nornagest/rpi_experiments
Begin of big refactoring

There's still a lot to do, but this is the begin of the big refactoring.