squashed siblings_in_law bug
Merge branch 'master' of github.com:alexwilkinson/families
permissiable spec not passing because greg is not confirming internally. works as expected on the site. added specs for conversation and family