Fix alphabetSize adjustment
Try std::map for dupmarking
Merge branch 'MAPQ-matei' of https://github.com/amplab/snap into MAPQ-matei

Conflicts:
	SNAPLib/Bam.cpp