rules types redone, looking good
Merge branch 'master' of https://github.com/denised/hobbsomatic