renamed some classes, minor changes
Merge branch 'master' of github.com:collective-congress/burocrat