Papering over a bug in the Local Compiler
Merge branch 'jnf-ugly-fix' into start-from-vlan1

Conflicts:
	frenetic/katnetic.ml
	lib/Semantics.ml
	lib/Semantics.mli
	setup.ml