The fiscal cliff deal shaping up between Obama and Boehner