Merge branch 'integration' of git://github.com/DataSoft/Honeyd into integration
Merge branch 'integration' of git://github.com/DataSoft/Honeyd into integration
Merge branch 'integration' of git://github.com/DataSoft/Honeyd into integration
Merge branch 'integration' of git://github.com/DataSoft/Honeyd into integration
Merge branch 'integration' of git://github.com/DataSoft/Honeyd into integration
Merge branch 'integration' of git://github.com/DataSoft/Honeyd into integration
Swapped out err and errx function calls with syslog calls

	All of the errors should now be printed in the Honeyd.log file
Fix TCP OPTS and WIN size not being sent on non nmap-probe packets

Helps with p0f fingerprinting a regular connection.
replaced 1 with EXIT_FAILURE
TEST: Minor speed improvement to the ostest regression script
Merge branch 'osscan' into integration
Added nmap-mac-prefixes to the makefile install 

ticket #51
Ignore the "Match Points" section of nmap-os-db when parsing it

Fixes #8
Changed install location of mac file and CLI arguments
now work to override the location of the mac prefix file
OSTEST: Use the -p flag to set honeyd to same fingerprints file as ostest arg
Finished copying the MAC prefix file to honeyd added
CLI Path override	#51
Merge branch 'integration' of ssh://helios/home/git/repositories/honeyd into integration
Merge branch 'integration' of ssh://helios/home/git/repositories/honeyd into integration
merge conflict resolution
Merge branch 'scripts' of ssh://helios/home/git/repositories/honeyd into scripts