Add more debugging info, formatting.
Merge branch 'master' of github.com:jheretic/commotiond