tidy
Merge branch 'master' of github:tlevine/blizzard

Conflicts:
	blizzard/nxgraph.py