Fixed the way n-grams are counted (e.g. pre-count normalizations); fixed bug in model pruning