Revert "increased timeout for geoip to 3 seconds"

This reverts commit e4c892b59734a0b6b67ad37a1d09c1618ec389d4.

services/web/app/coffee/infrastructure/GeoIpLookup.coffee

@@ -32,7 +32,7 @@ module.exports = GeoIpLookup =
 		ip = ip.trim().split(" ")[0]
 		opts = 
 			url: "#{settings.apis.geoIpLookup.url}/#{ip}"
-			timeout: 3000
+			timeout: 1000
 			json:true
 		logger.log ip:ip, opts:opts, "getting geo ip details"
 		request.get opts, (err, res, ipDetails)->

services/web/test/UnitTests/coffee/infrastructure/GeoIpLookupTests.coffee

@@ -43,7 +43,7 @@ describe "GeoIpLookup", ->
 
 		it "should request the details using the ip", (done)->
 			@GeoIpLookup.getDetails @ipAddress, (err)=>
-				@request.get.calledWith({url:@settings.apis.geoIpLookup.url+"/"+@ipAddress, timeout:3000, json:true}).should.equal true
+				@request.get.calledWith({url:@settings.apis.geoIpLookup.url+"/"+@ipAddress, timeout:1000, json:true}).should.equal true
 				done()
 
 		it "should return the ip details", (done)->
@@ -53,7 +53,7 @@ describe "GeoIpLookup", ->
 
 		it "should take the first ip in the string", (done)->
 			@GeoIpLookup.getDetails " #{@ipAddress} 456.312.452.102 432.433.888.234", (err)=>
-				@request.get.calledWith({url:@settings.apis.geoIpLookup.url+"/"+@ipAddress, timeout:3000, json:true}).should.equal true
+				@request.get.calledWith({url:@settings.apis.geoIpLookup.url+"/"+@ipAddress, timeout:1000, json:true}).should.equal true
 				done()
 
 	describe "getCurrencyCode", ->