Switch from PIL to pillow for tox and rtd
Revert to isort diff output
Workaround for the isort Travis issue by using order-by-type

See isort issue: https://github.com/timothycrosley/isort/issues/185