Code cleanup; refactor onepledgers as cells
Merge branch 'master' of https://github.com/cbothner/guillotine