Update the requirements files breaking out for pypy and non-pypy installs
Add verbose flag to see where pypy is hanging

(on travis)