Update CHANGE
Bump version number to 1.6.0
See if pypy works
Change .travis.yml
Merge