changes for ipython 3.0.0-dev