Merge pull request from @shuge

[aclark4life]

When merging @shuge's pull request by hand, I get:

aclark@Alexs-MacBook-Pro-2:/var/folders/vl/vj43x56d67g__xkjy71tfr680000gn/T/tmpKHyS90/Pillow/ > git pull git://github.com/shuge/Pillow.git master
remote: Counting objects: 69, done.
remote: Compressing objects: 100% (34/34), done.
remote: Total 68 (delta 25), reused 57 (delta 14)
Unpacking objects: 100% (68/68), done.
From git://github.com/shuge/Pillow
 * branch            master     -> FETCH_HEAD
Auto-merging .gitignore
CONFLICT (add/add): Merge conflict in .gitignore
Automatic merge failed; fix conflicts and then commit the result.

@shuge can you please fix and resubmit? Note Pillow has moved from the collective to python-imaging organization.

[aclark4life]

Going once, twice, and closed for @shuge. Please reopen if you get inspired it would be nice to have those demos.