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).
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
further progress
Merge branch 'master' into probe-v2
parse CLI provided output columns
Install man files under $(PREFIX)
$(EXTRA_CFLAGS) FOR RPM %{optflags}

We RPM packaging system need to use optflags for secure building, and of course will override the flags you've defined.

However the current one is not good, we should leave it to the end of the flags queue.

[rpmaker@fab SPECS]$ rpm -E %{optflags}
-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m32 -march=i686 -mtune=atom -fasynchronous-unwind-tables
further progress
adding types
adding generic csv output module
working fieldsets without headers