Fix definition of union/intersection in pytd grammar.

	PRESUBMIT=passed
	R=kramm
	CC=python-team
	DELTA=74 (40 added, 19 deleted, 15 changed)
	OCL=59063846
	DIFFBASE=59005845
	Nicer error output from pytd parser.