Merge pull request #91 from pydanny/pyup-update-pytest-3.3.0-to-3.5.0