VCF to Adam mega merge commit
Merge branch 'nested-variant-4' of https://github.com/nealsid/adam into nested-variant-4

Conflicts:
	adam-cli/pom.xml
	adam-core/src/main/scala/edu/berkeley/cs/amplab/adam/rdd/AdamContext.scala