Cleaned Travis, added pypy and fixed for Dj1.7