IPython 3.0 dev compatibility.
Merge pull request #35 from damianavila/ipy_dev_comp

IPython 3.0 dev compatibility.