renamed par -> union
Merge pull request #245 from frenetic-lang/par-to-union

renamed par -> union
Merge branch 'master' into remove-choice

Conflicts:
	lib/NetKAT_Automaton.ml
	lib/NetKAT_Types.ml
	lib/Semantics.ml
	test/NetKAT_Test.ml