Impute tips from more columns

In #220 we're imputing tips from the SIPP only based on age, employment income, and the number of people in the household under age 18 and 6. We can use more columns to improve the model.