An update to ipython. A few wrinkles still. See XXX in Makefile.