relationship refactor stage 1
Merge branch 'master' of github.com:sbryzak/picketlink