NAT
Fix issues from seliopou's review
Merge branch 'NAT'

Conflicts:
	_tags
	async/async.mldylib
	lib/netkat.mldylib
	myocamlbuild.ml
	setup.ml