add debugging flags
update oasis files
Merge branch 'adferguson-for_flowlog'

Conflicts:
	setup.ml