wrestling with git to get my commits to work.

Conflicts:
	build/lib/vcf/vcf.py
	dist/vcf-4.0-py3.3.egg
	vcf/vcf.py