Fixes issue #870: duplicated tests in the discrete module. In several cases, I removed one pair of similar tests by keeping the one that tests a superset of functionality.
Undid accidental commit of intellij files
Merge pull request #884 from guyrt/pyflakes-cleanup

Pyflakes cleanup #884