Update pytest to 2.5.1