General mods and cleaning code
Merge branch 'master' of https://github.com/oss6/pygraph