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