Merge branch 'master' into dillanButler
Fixes to render graph

Fixed some errors found with render graph after testing and removed
some random errors that github created
Merge branch 'dillanButler'