conman: Making it easier to add blocks to a scheme, and adding some more debugging facilities
Merge branch 'master' of github.com:jbohren/conman