Upgrade to py.test 2.5.1

Among other things, this paves the way forward for Python 3.4 support (pytest 2.4.0 does not work on Python 3.4).