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).
fixing recv_run header in recv.h. fixes issue #14
Merge branch 'master' of github.com:zmap/zmap
fixing recv_run header in recv.h. fixes issue #14
updating CHANGELOG
Merge branch 'stable'
abstracting out port validation because shared between udp and tcp.
beginning the implementation of new output / probe module interface
building fieldset and probe modules
adding output-fields to global conf
fixing get_gateway malloc error issue #21
further progress
Fixing issue #24; accidentally clobbering LDFLAGS and CFLAGS previously.
fixing issue #28, fixing memset operation in send_nl_req.