Replace with initial pass of Ipython ipynb conversion and cleanup