flake8: merging.py
add get_tokens() to DiscourseDocumentGraph
get_tokens() now returns (token node ID, token string) tuples
get_tokens takes token node attribute as parameter
fixes #21: merging works w/out tiger_tokenlist/rst_tokenlist
closes #23: RST files are tokenized during import
cleanup: removed old TODO
fixed namespace handling in TigerXML importer
TigerXML importer: added explicit node labels for dot export
RST importer: added explicit node/edge labels for dot export
conano importer: don't add precedence relations by default
rst importer: updated docstring
added generic merging method to DiscourseDocumentgraph base class
fixes #19: merging.py now uses generic merging method
added connected=False parameter to anaphoricity importer
updated merge-only make file test
fixed self.name default in tiger/conano importer
fixed debugging output in merge_graphs() method
flake8: dg.py
flake8: merging.py