Halfway commit to enable merging with a more up to date rbamtools