Tom's Dec 22 edits
Merge branch 'master' of github.com:sternSargentRA/pyTM
IPYNB: Pushing on a few changes.