DOC: nbconvert no longer necessary
Fix error message for IPython 2.0
Merge pull request #110 from jseabold/ipython-fixes

IPython cleanup