Feature/brian bionimbus bwa improvements

I'm merging my feature branch so I can bring in changes from Junjun and start testing for the 2.2 release.