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
Clean up snprintf and buffer size (less sloppy).
fieldset to support 32-bit systems
resolve merge conflicts and move timestamp to system field.
compiling json module
working MakeFile
Merge branch 'master' of github.com:zmap/zmap