Fix bug in dependency comparison

Conflicts:
	lib/NetKAT_LocalCompiler.ml
Remove Format margin tweaks
tidying