Update requirements to pick up py.test 2.3.5 which will allow us to use rerunfailures again