removed choice
Merge branch 'master' into remove-choice

Conflicts:
	lib/NetKAT_Automaton.ml
	lib/NetKAT_Types.ml
	lib/Semantics.ml
	test/NetKAT_Test.ml
fix merge
Merge branch 'master' into remove-choice

Conflicts:
	lib/LocalCompiler.ml
Merge branch 'master' into remove-choice

Conflicts:
	lib/NetKAT_Automaton.ml
	lib/NetKAT_Automaton.mli
Merge pull request #249 from frenetic-lang/remove-choice

Remove choice