Planning for new charitable contribution limits