flake8: spacing in discoursegraph.py
flake8: anaphoricity.py
flake8: removed unused imports in saltxmi.py
flake8: saltxmi.py spacing, docstring formatting
minor: saltxmi.py variable/test file renames
Merge branch 'master' into dev