Update to pytest 2.5.1
Fix failures on Python 3.x
Merge pull request #1970 from mdboom/testing/pytest-2.5.1

Upgrade to py.test 2.5.1