some minor bug fixes
Merge branch 'master' of https://github.com/dgarriga/POPBAM

Conflicts:
	pop_snp.cpp