filter private addresses
Merge branch 'filter-private'
use ip:port as key instead of ip only
Merge branch 'key-with-port'

Conflicts:
	scanner.js
fix glitch after key-with-port merge