Updated deprecated libevent 1.0 calls to libevent 2.x
Merge branch 'integration' of ssh://helios/home/git/repositories/honeyd into integration

Conflicts:
	stats.c
Fix for merge errors and compiler warnings
Fix for segfaults in libevent 2 conversions
Merge branch 'integration' into scripts
SCRIPTS: Fix restructuring error, change the import for ipp.py

import statement was changed, changed it back after it stopped working.
It's good now. snmpscrape checks for the string 'End of MIB' to remove
the last (possible) line of the snmpwalk outputs, but there was a newline
after that was screwing things up. Fixed it.

#50