Merge changes from ecc_thesis to master

Minor import logic changes and addition of has_mixed_morpheme to XigtReader.py to impose stricter requirements on when words may be entered into the lexicon as verbs or nouns.