Fixed pysam import Merge branch 'master' of https://github.com/ngcrawford/pypgen
Fixed pysam import
Merge branch 'master' of https://github.com/ngcrawford/pypgen

Conflicts:
	setup.py

ngcrawford/pypgen