ENH: make it work with IPython 2.0dev
Merge pull request #6 from fdeheeger/master

ENH: make it work with IPython 2.0dev