Import Image from the right location, so we can use both PIL and pillow.
Merge pull request #458 from whirm/update_image_import

Import Image from the right location, so we can use both PIL and pillow.