quick and dirty fix to make it compile and (seemingly) work
on 32 bits systems, it needs more testing though
OK, now the 32bit fix should be working, keeping numbers right
(maybe issues could still exists in summary print)
fixed blacklist.c
Update README
Merge branch 'master' of https://github.com/ciccio-87/zmap
Add json_file output format (uses json-c)
Add module names and gw mac address to output
Small typo fix to a comment
Merge branch 'master' into feature/add-json-output

Conflicts:
	INSTALL
Fix the data offset for icmp_echoscan
Clarify order of operations for compare
Note 64-bit requirement
Clean up snprintf and buffer size (less sloppy).
fixing makefile to not require ssldb for building redis
adding v1.0.1 to changelog.
Clean up and add memory requirements.
Merge branch 'stable'
Merge branch 'master' of https://github.com/ciccio-87/zmap into ciccio-87-master
cleaning up readme
fixing readme