Fix the column relations

+ add proper link states
fix sense links
Cache synset_id in sense
Merge branch 'master' of github.com:wordnet/wordnet

Conflicts:
	app/assets/javascripts/controllers/search.coffee