Merge branch 'master' of ssh://nickel.broadinstitute.org/humgen/gsa-scr1/gsa-engineering/git/unstable

public/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/ConsensusAlleleCounter.java

@@ -146,6 +146,10 @@ public class ConsensusAlleleCounter {
                 String indelString = p.getEventBases();
 
                 if ( p.isBeforeInsertion() ) {
+                    // edge case: ignore a deletion immediately preceding an insertion as p.getEventBases() returns null [EB]
+                    if ( indelString == null )
+                        continue;
+
                     boolean foundKey = false;
                     // copy of hashmap into temp arrayList
                     ArrayList<Pair<String,Integer>> cList = new ArrayList<Pair<String,Integer>>();