Updates for IPython 2.0