update kbbridge
Merge branch 'master' of github.com:daltonj/KbBridge

Conflicts:
	src/main/scala/edu/umass/ciir/kbbridge/search/EntityReprRetrieval.scala