Made a couple simple changes to remove warnings. Added a couple changes
for Roberto to support gapext and gapopen changes for BWA. If they don't
work we can simply move back a couple steps