Merge pull request #2522 from reaperhulk/unpin-pytest

Revert "pin pytest to disallow 2.8.4 which breaks tests"