Changed pytest dependencies to be < 2.6

Travis CI keeps upgrading py.test