refactored to make simpler keyword_link table

Keyword/table refactored to create simple table linking keywords to
subdiscipline, without userIDs
Updated datafiles