remove unused variable
solve conflict

Merge branch 'experimental' of github.com:gt1/biobambam into experimental

Conflicts:
	src/programs/bamsort.cpp