Updates for direct plotting of matplotlib figures

There is still work that needs to be done on getting everything to play nicely. The notebook has been updated to provide a working example given the current code versions.