Merge pull request #259 from cgohlke/patch-1

BUG: Fix webp encode errors on win-amd64
Merge pull request #243 from kostya0shift/master

Better support for ICO files
Wording
Merge branch 'master' of github.com:python-imaging/Pillow
Wording
Wording
Wording
Wording
Wording
Wording
Wording
Clean up
Wording
Wording
Wording
Fix ImportError during selftest. Remove path silliness.

Also apply PEP8 and print Pillow version during test.
Apply @Arfrever patch, fixes #258
Bump docs version
Configure Travis to build inplace
Add files