Don't expand image URLs that don't really point to images
Merge pull request #143 from moshee/master

Don't expand image URLs that don't really point to images.