Refactor image_url method.

- Passing `options` to the image_url method didn't make sense since
`options` is an instace method.
- Now the case where an url does not end in `photo.jpg` is also handled: the
original image is returned instead. A test case was added for this situation.
Merge branch 'refactor-image-url'