Upgrade to py.test 2.4.0 both in our internal copy and what we install
on Travis
Merge pull request #1506 from mdboom/testing/pytest-2.4.0-part3

Upgrade internal py.test to 2.4.0, and install that on Travis for good measure