merging master for 1.2.0 release
Merge in revno bump on man page
Merge branch 'master' into stable

Merge in updated INSTALL docs
adding changelog for release 1.2.0
Merge branch 'stable' of github.com:zmap/zmap into stable
Update Portfile for v1.2.0
Merge in changes for 1.2.1

Merge branch 'master' into stable

Conflicts:
	packaging/macports/net/zmap/Portfile
Merge in revno change for 1.2.1

Merge branch 'master' into stable

Conflicts:
	CMakeLists.txt
	src/zopt.ggo
Update CHANGELOG for v1.2.1
Implement send retry count flag

Working implementation, but still needs performance testing. Adds
--retries flag, which sets the number of times to retry if a packet send
fails (e.g. the UNIX send function fails). Default is 10.
corrected app success stat
Merge pull request #183 from MrPumo/improve_monitor_new

corrected app success stat
Merge branch 'fail-retry'

Fixes #136

Conflicts:
	src/zmap.c
	src/zopt.ggo
Fix spelling in module_udp.c
Merge pull request #184 from tdi/master

Fix spelling in module_udp.c
add whitelisting info
increment whitelisted counter
Merge pull request #188 from azet/azet-whitelistinfo

Add counter for whitelisted IP's in summary.
Link banner-grab against lockfd.o

Fixes #192
Align zopt.ggo nicer

It uses spaces instead of tabs now. Deal with it.