Add PyPy to tox and travis again