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.