Move ngrams train/test programs
Add discount option to train-ngram.