Updates to support Pillow (new PIL)
Pulling in changes from v0.1.x