Reverted bcea506 as it breaks a number of tests (testing assumes composers can handle SVO and VO features)
Minor fixes to unit tests that had not been run in a while and were slightly out of date
Added functionality that allows thesaurus neighbours of an entry that lexically overlap with the entry to be removed from the thesaurus. Includes unit tests and a conf file switch to enable it. Note this only works when a thesaurus is loaded from a TSV file.
Added allow_lexical_overlap=False to all experiments' conf files
Added nouns and adjectives to the composed n-gram thesauri.

This required an extra parameter ThesaurusVectorizer (and in confrc) to just get adjectives and nouns. Also had to make SVD output both ngrams and unigrams. dump_al_composed_vectors now extracts N and J features and writes them in the thesaurus alongside all composed vectors.
Changed it so that at encode time both NPs and unigrams  (N and J) are used as feature, and at decode time only NPs are considered and mapped to known features
Minor fix- forgot to pass one extra parameter