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