Merge branch 'master' of git://github.com/pezmaster31/bamtools

Conflicts:
	src/api/BamReader.cpp

diff --cc src/api/BamAux.h
Simple merge

diff --cc src/api/BamIndex.cpp
Simple merge

diff --cc src/api/BamReader.cpp
Simple merge