prepare for merge to master
prepare for merge to master

souravsingh/khmer,ged-lab/khmer,ged-lab/khmer,Winterflower/khmer,souravsingh/khmer,F1000Research/khmer,jas14/khmer,kdmurray91/khmer,souravsingh/khmer,F1000Research/khmer,Winterflower/khmer,jas14/khmer,Winterflower/khmer,ged-lab/khmer,kdmurray91/khmer,kdmurray91/khmer,jas14/khmer,F1000Research/khmer