Address final comments
Merge branch 'ipynb_out' of github.com:jdfreder/ipython into ipynb_out