Added some more data to the distribution dict
Fixed some template bugs
Tweaked some test cases
Merge branch 'master' of https://github.com/tleeuwenburg/wordgraph

Conflicts:
	tests/test_recalcitrant.py
	wordgraph/grapher.py