Support 2.0

Support for IPython 1.1.0 and 2.0.0.