moving to ipaddr module
Update _oasis
reverting to Ipaddr lib
adding merlin file
Merge branch 'master' of https://github.com/crotsos/ocaml-pttcp into hadoop_model

Conflicts:
	_oasis
	_tags
	lib/META
	lib/pttcp_tcp.ml
	lib/pttcp_tcp.mli
	lib/pttcp_udp.ml
	myocamlbuild.ml
	setup.ml