Clean up of digitizer and addition of clustering

updating to latest GEM digitization by Roumyana