Rising Inequality? Changes in the Distribution of Income and Consumption in the 1980s