Fixes to tests. Note, test coverage is STILL NOT right.
Merge branch 'master' of https://github.com/tleeuwenburg/wordgraph

Conflicts:
	wordgraph/realiser/__init__.py
	wordgraph/realiser/templates/en/long-desc.txt
Tweaked a bunch of stuff for test compliance
Added short description templates identical to the long description templates
xfailed a whole bunch of tests