Updates to merge
Merging everything.

Merge branch 'master' of github.com:ngcrawford/pypgen

Conflicts:
	VCF.py