working configuration
Merge branch 'master' of https://github.com/presidential-monkey-conspiracy/hazardous-vocabulary-overdrive into HEAD

Conflicts:
	graph.py