Updates for version 2.0
Updates for IPython 2.0