WIP.  Code cleanup.  Added ipython to stack.