Tidy the travis CI config
Pin pillow at an extant version

Pillow was pinned at 1.1.7, a version no longer in PyPI.
Merge remote-tracking branch 'upstream/next' into next