trying this.

Merge pull request #23 from nbdt/revertHouseRules

Revert "Merge pull request #9 from flamsmark/administrative-reorg"
Probably not a good thing happening right here. I hate git.