some updates for making the OTT graph
Merge branch 'master' into origin-grapheek

Conflicts:
	ivy/treegraph.py