merged upstrea,
Update geoloc.json
Merge remote-tracking branch 'origin/p0f-and-shockpot' into p0f-and-shockpot
big fixes
Merge pull request #1 from threatstream/p0f-and-shockpot

P0f and shockpot