Allow NGramFeatures to be named in order to avoid conflicts when using more than one set of them
slight beautification and more sane ordering
Merge branch 'master' of https://github.com/redpony/cdec