Making sure to use 2-space tabs
Removing wayward merge cruft.
Merge branch 'whitespace' into graph

Conflicts:
	src/main/resources/avro/readmethods.avdl
	src/main/resources/avro/variantmethods.avdl