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
Merge branch 'master' into stable

Bring in changes for 2.0.0
Mark as RC
Merge branch 'master' into stable

Bring in JSON change
Merge branch 'master' into stable
no longer pinrt to log the CIDR blacks being blacklisted. these are data to be included in the metadata, not in the log file.