Add non-custodial parent case to householding, and make logic more clear
Merge branch 'householding_update'