Changed EQ characters to follow strict inheres_in.
Merge branch 'master' into EQ-inheres-only
Merge branch 'master' into EQ-inheres-only
Merged in master.
Updated some Vocab constant names.