Update to work with latest IPython 1.0.dev from git