Robtandy/better graphviz plans (#135)

* wip

* wip save before merge

* wip fix extra edges

* wip fix extra edges II

* wip fix extra edges III

* wip fix extra edges IV

* wip fix extra edges V

* wip fix extra edges VI

* wip fix extra edges VII

* wip fix extra edges VIII

* wip fix extra edges IX

* wip fix extra edges X

Author: robtandy