Do Not Merge Fix graph

This PR replaces PR #314, which I will delete.  My graph got messed up and this PR contains all the previous changes plus work on uw2.rst.  There will be questions embedded in the uw2 changelines.
Feel free to do what you think is best on this.