Fix check for PyGraphviz in .travis.yml
Fix check for PyGraphviz in .travis.yml (cont'd)
Fix check for PyGraphviz in .travis.yml (cont'd)
Merge branch 'master' into fiedler

Conflicts:
	.travis.yml