I don't remember what I changed here
Merge branch 'master' of https://github.com/matthuska/cmbr

Conflicts:
	bamsignals/R/wrappers.R
Applied fix suggested by Ho, but I have no idea of what is going on there