Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.textile
Merge branch 'master' of github.com:shantanusharma/bam-readcount