added gengetopt as a depends of zmap
added byacc-noconflict as a depends of zmap
added zmap per issue #507
Merge remote-tracking branch 'upstream/unstable'
gengetopt: Fix all of the asinine styling mistakes.
byacc-noconflict: Fix style.
zmap: Clean up.
AUTHORS: Remove some accidentally-committed content.
Merge branch 'master' of https://github.com/noptrix/blackarch into unstable
scripts/conflicts: Lower the job numbers.
blackarch - pingtunnel added
Merge branch 'master' of https://github.com/nrzizrn/blackarch into unstable
pingtunnel: Fix styles.
Merge branch 'master' of https://github.com/noptrix/blackarch into unstable
fakedns: Fix a python/python2 error.
ncp: Fix style.
libowfat: Fix a conflict with extra/tinycdb.