Add link score to wikiLink field, set score to -1 for old extractions.
Don't serialize wikilink score when none present.
Add linked extraction sample for test.
Change findSlotFillsServer to optionally do one slot at a time.
Merge branch 'master' into rerank
Fixup formatting, change reranker to use trimmed fill.
Fix output bug.
Actually fix output bug for real this time.
Output formatting changes.
Merge 'trimSlotFill' into rerank

Conflicts:
	slotfiller/src/main/scala/edu/knowitall/tac2013/findSlotFillersApp/KBPQueryExecutor.scala
	slotfiller/src/main/scala/edu/knowitall/tac2013/findSlotFillersApp/KbpQueryOutput.scala
Rename SlotTypes to Slot, add case class Slot.
Refactor slot loading.
Change String to Slot where applicable.
Load patterns with slots, get patterns from slots.
Keep solr query string in candidate.
Rename KbpQueryOutput to OutputFormatter.
Make OutputFormatter a class.
Consolidate output code and pipeline.
Refactor output code.
Add diagnostic output for grouping.