remove ssldb and fix redis callback
Merge branch 'master' of github.com:zmap/zmap
This is the last commit needed to build with REDIS
Merge pull request #8 from hmoore-r7/bug/fix-redis-output-compile

This is the last commit needed to build with REDIS
Clean up and add memory requirements.
Add json_file output format (uses json-c)
Add module names and gw mac address to output
Merge branch 'hmoore-r7-feature/add-udp-probe-specifiers'
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
Clean up snprintf and buffer size (less sloppy).