Do not assume server for image location based on IP
Merge pull request #179 from vedujoshi/master

Do not assume server for image location based on IP