s
fixMerge branch 'pre-0.8.1-dev' of github.com:vFense/vFense into pre-0.8.1-dev

Conflicts:
	bin/vFensed
new redhat vulns
iWorking on stat apis