Merge variant schema code changes with BigDataGenomics master
Merge branch 'nested-variant-2' of https://github.com/nealsid/adam into nested-variant-2

Conflicts:
	adam-core/src/test/scala/edu/berkeley/cs/amplab/adam/projections/FieldEnumerationSuite.scala