allow phrases and ngrams at the same time
"faster"
ngram pairs had extra wrapping
note need to double-check how ngram keys are composed to avoid collisions
Merge branch 'ngrams-and-phrases'
bump minor