intermittent commit so I can pull a butt load of changs
merge
remove old resource_relationship_* ruleforms
Merge branch 'master' of https://github.com/Hellblazer/Ultrastructure