Misc changes
Merge branch 'master' of https://github.com/dgarriga/POPBAM

Conflicts:
	pop_nucdiv.cpp
	popbam.cpp
	popbam.h