Merge pull request #6 from vedujoshi/master

Do a better match while looking for existing images
Disable http_proxy so that CI systems can use