[doc] tweak ordering
[lib] sorting out flows
[make] tweak distclean/handling _tags
Add fix for change to new ipaddr library
Merge remote-tracking branch 'clegg/master' into refactor

Conflicts:
	_oasis
	_tags
	lib/META
	myocamlbuild.ml
	setup.ml
shuffling files
shuffling
oasis: update
oasis: configs
checkpoint
remove pcap test file for now
git: ignore osx droppings
git: tweaks
oasis: comment; regen
merlin: basic merlin file
git: ignore tmp subdir
merlin: tweak merlin config
oasis: further tweaks to build exec
make: turn off `classic-display`
oasis: rebuild