Improve formatting of error reports
Make $(uname -r) the default kernel
Merge branch 'master' into testing