ties family to reviews'
fixes merge conflicts in person.rb
fixes blog id conflict
merging upstream changes