Merge pull request #64 from jgilme1/corefUtils

Coref utils
Filter out fills that look like they have HTML in them.
Merge branch 'master' into polish
Display offsets in broswser.
Removed alternate names code and added a filter for NodeID contradictions when the KBP query has no wiki node id
Merge pull request #65 from jgilme1/smallBugFixes

Removed alternate names code and added a filter for NodeID contradiction...
Fix offset formatting.
Merge branch 'master' into polish
updated job title lists
Merge branch 'master' into smallBugFixes
Only enforce no wikilink when entity string has multiple wikilinks.
Merge pull request #66 from jgilme1/smallBugFixes

Small bug fixes
Only enforce no wikilink when entity string has multiple wikilinks.
Only enforce no wikilink when entity string has multiple wikilinks.
Merge branch 'master' into polish
Merge pull request #67 from rbart/polish

Relax no-wikilink rule and filter out fills with HTML
Merge branch 'master' into corefUtils

Conflicts:
	slotfiller/src/main/scala/edu/knowitall/tac2013/app/KBPQuery.scala